(eudc-expansion-overwrites-query): Use "non-nil" in docstrings.

[gnu-emacs] / lisp / net / eudc-bob.el

diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index a4ad3044f435d5ef677db890291c16509d5c73a3..c6506fddb935bf5ff84359495bf1243408c7e79b 100644 (file)
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,6 +1,7 @@
 ;;; eudc-bob.el --- Binary Objects Support for EUDC
 
-;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
@@ -69,7 +70,7 @@
 
 (defun eudc-jump-to-event (event)
   "Jump to the window and point where EVENT occurred."
-  (if eudc-xemacs-p
+  (if (fboundp 'event-closest-point)
       (goto-char (event-closest-point event))
     (set-buffer (window-buffer (posn-window (event-start event))))
     (goto-char (posn-point (event-start event)))))
@@ -89,7 +90,7 @@
 
 (defun eudc-bob-can-display-inline-images ()
   "Return non-nil if we can display images inline."
-  (if eudc-xemacs-p
+  (if (fboundp 'console-type)
       (and (memq (console-type) '(x mswindows))
           (fboundp 'make-glyph))
     (and (fboundp 'display-graphic-p)
@@ -120,7 +121,7 @@ LABEL."
   "Display the JPEG DATA at point.
 If INLINE is non-nil, try to inline the image otherwise simply
 display a button."
-  (cond (eudc-xemacs-p
+  (cond ((fboundp 'make-glyph)
         (let ((glyph (if (eudc-bob-can-display-inline-images)
                          (make-glyph (list (vector 'jpeg :data data)
                                            [string :data "[JPEG Picture]"])))))