2000-01-12 20:50:20 +00:00
|
|
|
|
;;; eudc-bob.el --- Binary Objects Support for EUDC
|
|
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
|
;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
2002-01-16 08:05:19 +00:00
|
|
|
|
;; Author: Oscar Figueiredo <oscar@cpe.fr>
|
|
|
|
|
;; Maintainer: Pavel Jan<61>k <Pavel@Janik.cz>
|
2002-01-06 16:37:36 +00:00
|
|
|
|
;; Keywords: comm
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: eudc
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
2008-05-06 07:31:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-01-12 20:50:20 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 07:31:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 07:31:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
2001-07-16 07:46:48 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
;;; Usage:
|
|
|
|
|
;; See the corresponding info file
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(require 'eudc)
|
|
|
|
|
|
|
|
|
|
(defvar eudc-bob-generic-keymap nil
|
|
|
|
|
"Keymap for multimedia objects.")
|
|
|
|
|
|
|
|
|
|
(defvar eudc-bob-image-keymap nil
|
|
|
|
|
"Keymap for inline images.")
|
|
|
|
|
|
|
|
|
|
(defvar eudc-bob-sound-keymap nil
|
2000-01-13 13:55:49 +00:00
|
|
|
|
"Keymap for inline sounds.")
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
(defvar eudc-bob-url-keymap nil
|
2002-01-04 07:59:46 +00:00
|
|
|
|
"Keymap for inline urls.")
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
2002-01-16 08:05:19 +00:00
|
|
|
|
(defvar eudc-bob-mail-keymap nil
|
|
|
|
|
"Keymap for inline e-mail addresses.")
|
|
|
|
|
|
2009-09-01 03:16:07 +00:00
|
|
|
|
(defvar eudc-bob-generic-menu
|
2000-01-12 20:50:20 +00:00
|
|
|
|
'("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]))
|
|
|
|
|
|
2009-09-01 03:16:07 +00:00
|
|
|
|
(defvar eudc-bob-image-menu
|
2000-01-12 20:50:20 +00:00
|
|
|
|
`("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))))
|
2002-01-06 15:08:06 +00:00
|
|
|
|
|
2009-09-01 03:16:07 +00:00
|
|
|
|
(defvar eudc-bob-sound-menu
|
2000-01-12 20:50:20 +00:00
|
|
|
|
`("EUDC Sound Menu"
|
|
|
|
|
["---" nil nil]
|
2000-11-15 20:54:15 +00:00
|
|
|
|
["Play sound" eudc-bob-play-sound-at-point
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(fboundp 'play-sound)]
|
|
|
|
|
,@(cdr (cdr eudc-bob-generic-menu))))
|
2002-01-06 15:08:06 +00:00
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(defun eudc-jump-to-event (event)
|
|
|
|
|
"Jump to the window and point where EVENT occurred."
|
2005-07-16 18:07:59 +00:00
|
|
|
|
(if (fboundp 'event-closest-point)
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(goto-char (event-closest-point event))
|
|
|
|
|
(set-buffer (window-buffer (posn-window (event-start event))))
|
|
|
|
|
(goto-char (posn-point (event-start event)))))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-get-overlay-prop (prop)
|
|
|
|
|
"Get property PROP from one of the overlays around."
|
|
|
|
|
(let ((overlays (append (overlays-at (1- (point)))
|
|
|
|
|
(overlays-at (point))))
|
|
|
|
|
overlay value
|
|
|
|
|
(notfound t))
|
|
|
|
|
(while (and notfound
|
|
|
|
|
(setq overlay (car overlays)))
|
|
|
|
|
(if (setq value (overlay-get overlay prop))
|
|
|
|
|
(setq notfound nil))
|
|
|
|
|
(setq overlays (cdr overlays)))
|
|
|
|
|
value))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-can-display-inline-images ()
|
|
|
|
|
"Return non-nil if we can display images inline."
|
2005-07-16 18:07:59 +00:00
|
|
|
|
(if (fboundp 'console-type)
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(and (memq (console-type) '(x mswindows))
|
|
|
|
|
(fboundp 'make-glyph))
|
2002-01-05 18:54:53 +00:00
|
|
|
|
(and (fboundp 'display-graphic-p)
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(display-graphic-p))))
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
(defun eudc-bob-make-button (label keymap &optional menu plist)
|
|
|
|
|
"Create a button with LABEL.
|
2000-11-15 20:54:15 +00:00
|
|
|
|
Attach KEYMAP, MENU and properties from PLIST to a new overlay covering
|
2000-01-12 20:50:20 +00:00
|
|
|
|
LABEL."
|
|
|
|
|
(let (overlay
|
|
|
|
|
(p (point))
|
|
|
|
|
prop val)
|
|
|
|
|
(insert label)
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(put-text-property p (point) 'face 'bold)
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(setq overlay (make-overlay p (point)))
|
|
|
|
|
(overlay-put overlay 'mouse-face 'highlight)
|
|
|
|
|
(overlay-put overlay 'keymap keymap)
|
|
|
|
|
(overlay-put overlay 'local-map keymap)
|
|
|
|
|
(overlay-put overlay 'menu menu)
|
|
|
|
|
(while plist
|
|
|
|
|
(setq prop (car plist)
|
|
|
|
|
plist (cdr plist)
|
|
|
|
|
val (car plist)
|
|
|
|
|
plist (cdr plist))
|
|
|
|
|
(overlay-put overlay prop val))))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-display-jpeg (data inline)
|
|
|
|
|
"Display the JPEG DATA at point.
|
2000-11-15 20:54:15 +00:00
|
|
|
|
If INLINE is non-nil, try to inline the image otherwise simply
|
2000-01-12 20:50:20 +00:00
|
|
|
|
display a button."
|
2005-07-16 18:07:59 +00:00
|
|
|
|
(cond ((fboundp 'make-glyph)
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(let ((glyph (if (eudc-bob-can-display-inline-images)
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(make-glyph (list (vector 'jpeg :data data)
|
2000-01-13 13:55:49 +00:00
|
|
|
|
[string :data "[JPEG Picture]"])))))
|
|
|
|
|
(eudc-bob-make-button "[JPEG Picture]"
|
|
|
|
|
eudc-bob-image-keymap
|
|
|
|
|
eudc-bob-image-menu
|
|
|
|
|
(list 'glyph glyph
|
|
|
|
|
'end-glyph (if inline glyph)
|
|
|
|
|
'duplicable t
|
|
|
|
|
'invisible inline
|
|
|
|
|
'start-open t
|
|
|
|
|
'end-open t
|
|
|
|
|
'object-data data))))
|
2002-01-05 18:54:53 +00:00
|
|
|
|
((fboundp 'create-image)
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(let* ((image (create-image data nil t))
|
|
|
|
|
(props (list 'object-data data 'eudc-image image)))
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(when (and inline (image-type-available-p 'jpeg))
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(setq props (nconc (list 'display image) props)))
|
|
|
|
|
(eudc-bob-make-button "[Picture]"
|
|
|
|
|
eudc-bob-image-keymap
|
|
|
|
|
eudc-bob-image-menu
|
|
|
|
|
props)))))
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
(defun eudc-bob-toggle-inline-display ()
|
|
|
|
|
"Toggle inline display of an image."
|
|
|
|
|
(interactive)
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(when (eudc-bob-can-display-inline-images)
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(cond ((featurep 'xemacs)
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(let ((overlays (append (overlays-at (1- (point)))
|
|
|
|
|
(overlays-at (point))))
|
|
|
|
|
overlay glyph)
|
|
|
|
|
(setq overlay (car overlays))
|
|
|
|
|
(while (and overlay
|
|
|
|
|
(not (setq glyph (overlay-get overlay 'glyph))))
|
|
|
|
|
(setq overlays (cdr overlays))
|
|
|
|
|
(setq overlay (car overlays)))
|
|
|
|
|
(if overlay
|
|
|
|
|
(if (overlay-get overlay 'end-glyph)
|
|
|
|
|
(progn
|
|
|
|
|
(overlay-put overlay 'end-glyph nil)
|
|
|
|
|
(overlay-put overlay 'invisible nil))
|
|
|
|
|
(overlay-put overlay 'end-glyph glyph)
|
|
|
|
|
(overlay-put overlay 'invisible t)))))
|
|
|
|
|
(t
|
|
|
|
|
(let* ((overlays (append (overlays-at (1- (point)))
|
|
|
|
|
(overlays-at (point))))
|
|
|
|
|
image)
|
|
|
|
|
|
|
|
|
|
;; Search overlay with an image.
|
|
|
|
|
(while (and overlays (null image))
|
|
|
|
|
(let ((prop (overlay-get (car overlays) 'eudc-image)))
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(if (eq 'image (car-safe prop))
|
2000-01-13 13:55:49 +00:00
|
|
|
|
(setq image prop)
|
|
|
|
|
(setq overlays (cdr overlays)))))
|
|
|
|
|
|
|
|
|
|
;; Toggle that overlay's image display.
|
|
|
|
|
(when overlays
|
|
|
|
|
(let ((overlay (car overlays)))
|
|
|
|
|
(overlay-put overlay 'display
|
|
|
|
|
(if (overlay-get overlay 'display)
|
|
|
|
|
nil image)))))))))
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
(defun eudc-bob-display-audio (data)
|
|
|
|
|
"Display a button for audio DATA."
|
|
|
|
|
(eudc-bob-make-button "[Audio Sound]"
|
|
|
|
|
eudc-bob-sound-keymap
|
|
|
|
|
eudc-bob-sound-menu
|
|
|
|
|
(list 'duplicable t
|
|
|
|
|
'start-open t
|
|
|
|
|
'end-open t
|
|
|
|
|
'object-data data)))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-display-generic-binary (data)
|
|
|
|
|
"Display a button for unidentified binary DATA."
|
|
|
|
|
(eudc-bob-make-button "[Binary Data]"
|
|
|
|
|
eudc-bob-generic-keymap
|
|
|
|
|
eudc-bob-generic-menu
|
|
|
|
|
(list 'duplicable t
|
|
|
|
|
'start-open t
|
|
|
|
|
'end-open t
|
|
|
|
|
'object-data data)))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-play-sound-at-point ()
|
|
|
|
|
"Play the sound data contained in the button at point."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let (sound)
|
|
|
|
|
(if (null (setq sound (eudc-bob-get-overlay-prop 'object-data)))
|
|
|
|
|
(error "No sound data available here")
|
2002-01-16 08:05:19 +00:00
|
|
|
|
(unless (fboundp 'play-sound)
|
|
|
|
|
(error "Playing sounds not supported on this system"))
|
|
|
|
|
(play-sound (list 'sound :data sound)))))
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
(defun eudc-bob-play-sound-at-mouse (event)
|
|
|
|
|
"Play the sound data contained in the button where EVENT occurred."
|
|
|
|
|
(interactive "e")
|
|
|
|
|
(save-excursion
|
|
|
|
|
(eudc-jump-to-event event)
|
|
|
|
|
(eudc-bob-play-sound-at-point)))
|
2002-01-05 18:54:53 +00:00
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(defun eudc-bob-save-object ()
|
|
|
|
|
"Save the object data of the button at point."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((data (eudc-bob-get-overlay-prop 'object-data))
|
|
|
|
|
(buffer (generate-new-buffer "*eudc-tmp*")))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (fboundp 'set-buffer-file-coding-system)
|
|
|
|
|
(set-buffer-file-coding-system 'binary))
|
|
|
|
|
(set-buffer buffer)
|
2002-01-05 18:54:53 +00:00
|
|
|
|
(set-buffer-multibyte nil)
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(insert data)
|
|
|
|
|
(save-buffer))
|
|
|
|
|
(kill-buffer buffer)))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-pipe-object-to-external-program ()
|
|
|
|
|
"Pipe the object data of the button at point to an external program."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((data (eudc-bob-get-overlay-prop 'object-data))
|
|
|
|
|
(buffer (generate-new-buffer "*eudc-tmp*"))
|
|
|
|
|
program
|
|
|
|
|
viewer)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (fboundp 'set-buffer-file-coding-system)
|
|
|
|
|
(set-buffer-file-coding-system 'binary))
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(insert data)
|
|
|
|
|
(setq program (completing-read "Viewer: " eudc-external-viewers))
|
|
|
|
|
(if (setq viewer (assoc program eudc-external-viewers))
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(call-process-region (point-min) (point-max)
|
|
|
|
|
(car (cdr viewer))
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(cdr (cdr viewer)))
|
|
|
|
|
(call-process-region (point-min) (point-max) program)))
|
2009-09-18 07:07:33 +00:00
|
|
|
|
(error
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(kill-buffer buffer)))))
|
|
|
|
|
|
|
|
|
|
(defun eudc-bob-menu ()
|
|
|
|
|
"Retrieve the menu attached to a binary object."
|
|
|
|
|
(eudc-bob-get-overlay-prop 'menu))
|
2002-01-06 15:08:06 +00:00
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(defun eudc-bob-popup-menu (event)
|
|
|
|
|
"Pop-up a menu of EUDC multimedia commands."
|
|
|
|
|
(interactive "@e")
|
|
|
|
|
(run-hooks 'activate-menubar-hook)
|
|
|
|
|
(eudc-jump-to-event event)
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(if (featurep 'xemacs)
|
2000-11-15 20:54:15 +00:00
|
|
|
|
(progn
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(run-hooks 'activate-popup-menu-hook)
|
|
|
|
|
(popup-menu (eudc-bob-menu)))
|
|
|
|
|
(let ((result (x-popup-menu t (eudc-bob-menu)))
|
|
|
|
|
command)
|
|
|
|
|
(if result
|
|
|
|
|
(progn
|
|
|
|
|
(setq command (lookup-key (eudc-bob-menu)
|
|
|
|
|
(apply 'vector result)))
|
|
|
|
|
(command-execute command))))))
|
|
|
|
|
|
|
|
|
|
(setq eudc-bob-generic-keymap
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map "s" 'eudc-bob-save-object)
|
2002-01-05 18:54:53 +00:00
|
|
|
|
(define-key map "!" 'eudc-bob-pipe-object-to-external-program)
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(define-key map (if (featurep 'xemacs)
|
2000-01-12 20:50:20 +00:00
|
|
|
|
[button3]
|
|
|
|
|
[down-mouse-3]) 'eudc-bob-popup-menu)
|
|
|
|
|
map))
|
|
|
|
|
|
|
|
|
|
(setq eudc-bob-image-keymap
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map "t" 'eudc-bob-toggle-inline-display)
|
|
|
|
|
map))
|
|
|
|
|
|
|
|
|
|
(setq eudc-bob-sound-keymap
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map [return] 'eudc-bob-play-sound-at-point)
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(define-key map (if (featurep 'xemacs)
|
2000-01-12 20:50:20 +00:00
|
|
|
|
[button2]
|
|
|
|
|
[down-mouse-2]) 'eudc-bob-play-sound-at-mouse)
|
|
|
|
|
map))
|
|
|
|
|
|
|
|
|
|
(setq eudc-bob-url-keymap
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map [return] 'browse-url-at-point)
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(define-key map (if (featurep 'xemacs)
|
2000-01-12 20:50:20 +00:00
|
|
|
|
[button2]
|
|
|
|
|
[down-mouse-2]) 'browse-url-at-mouse)
|
|
|
|
|
map))
|
|
|
|
|
|
2002-01-16 08:05:19 +00:00
|
|
|
|
(setq eudc-bob-mail-keymap
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(define-key map [return] 'goto-address-at-point)
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(define-key map (if (featurep 'xemacs)
|
2002-01-16 08:05:19 +00:00
|
|
|
|
[button2]
|
|
|
|
|
[down-mouse-2]) 'goto-address-at-mouse)
|
|
|
|
|
map))
|
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
(set-keymap-parent eudc-bob-image-keymap eudc-bob-generic-keymap)
|
|
|
|
|
(set-keymap-parent eudc-bob-sound-keymap eudc-bob-generic-keymap)
|
|
|
|
|
|
2009-09-01 03:16:07 +00:00
|
|
|
|
;; If the first arguments can be nil here, then these 3 can be
|
|
|
|
|
;; defconsts once more.
|
* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
|
|
|
|
(when (not (featurep 'xemacs))
|
|
|
|
|
(easy-menu-define eudc-bob-generic-menu
|
|
|
|
|
eudc-bob-generic-keymap
|
|
|
|
|
""
|
|
|
|
|
eudc-bob-generic-menu)
|
|
|
|
|
(easy-menu-define eudc-bob-image-menu
|
|
|
|
|
eudc-bob-image-keymap
|
|
|
|
|
""
|
|
|
|
|
eudc-bob-image-menu)
|
|
|
|
|
(easy-menu-define eudc-bob-sound-menu
|
|
|
|
|
eudc-bob-sound-keymap
|
|
|
|
|
""
|
|
|
|
|
eudc-bob-sound-menu))
|
2000-01-12 20:50:20 +00:00
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun eudc-display-generic-binary (data)
|
|
|
|
|
"Display a button for unidentified binary DATA."
|
|
|
|
|
(eudc-bob-display-generic-binary data))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun eudc-display-url (url)
|
|
|
|
|
"Display URL and make it clickable."
|
|
|
|
|
(require 'browse-url)
|
|
|
|
|
(eudc-bob-make-button url eudc-bob-url-keymap))
|
|
|
|
|
|
2002-01-16 08:05:19 +00:00
|
|
|
|
;;;###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))
|
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun eudc-display-sound (data)
|
|
|
|
|
"Display a button to play the sound DATA."
|
|
|
|
|
(eudc-bob-display-audio data))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun eudc-display-jpeg-inline (data)
|
|
|
|
|
"Display the JPEG DATA inline at point if possible."
|
|
|
|
|
(eudc-bob-display-jpeg data (eudc-bob-can-display-inline-images)))
|
|
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
|
(defun eudc-display-jpeg-as-button (data)
|
|
|
|
|
"Display a button for the JPEG DATA."
|
|
|
|
|
(eudc-bob-display-jpeg data nil))
|
2002-01-06 15:08:06 +00:00
|
|
|
|
|
2000-01-12 20:50:20 +00:00
|
|
|
|
;;; eudc-bob.el ends here
|