[Emacs-diffs] Changes to emacs/lisp/ezimage.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/05/17 20:21:00

Index: ezimage.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ezimage.el,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ezimage.el  6 May 2008 07:57:34 -0000       1.11
+++ ezimage.el  17 May 2008 20:20:55 -0000      1.12
@@ -1,7 +1,7 @@
 ;;; ezimage --- Generalized Image management
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <address@hidden>
 ;; Keywords: file, tags, tools
@@ -33,20 +33,17 @@
 ;;
 ;; This file requires the `image' package if it is available.
 
-(condition-case nil
+(condition-case nil                    ; for older XEmacs
     (require 'image)
   (error nil))
 
 ;;; Code:
-(defcustom ezimage-use-images
-  (and (or (fboundp 'defimage) ; emacs 21
-          (fboundp 'make-image-specifier)) ; xemacs
-       (if (fboundp 'display-graphic-p) ; emacs 21
-          (display-graphic-p)
-        window-system) ; old emacs & xemacs
-       (or (not (fboundp 'image-type-available-p)) ; xemacs?
-          (image-type-available-p 'xpm))) ; emacs 21
-  "*Non-nil if ezimage should display icons."
+(defcustom ezimage-use-images (if (featurep 'xemacs)
+                                 (and (fboundp 'make-image-specifier)
+                                      window-system)
+                               (and (display-images-p)
+                                    (image-type-available-p 'xpm)))
+  "Non-nil means ezimage should display icons."
   :group 'ezimage
   :version "21.1"
   :type 'boolean)
@@ -54,19 +51,15 @@
 ;;; Create our own version of defimage
 (eval-and-compile
 
-(if (fboundp 'defimage)
-
+(if (featurep 'emacs)
     (progn
-
-(defmacro defezimage (variable imagespec docstring)
+      (defmacro defezimage (variable imagespec docstring)
   "Define VARIABLE as an image if `defimage' is not available.
 IMAGESPEC is the image data, and DOCSTRING is documentation for the image."
   `(progn
      (defimage ,variable ,imagespec ,docstring)
      (put (quote ,variable) 'ezimage t)))
 
-;    (defalias 'defezimage 'defimage)
-
 ;; This hack is for the ezimage install which has an icons direcory for
 ;; the default icons to be used.
 ;; (add-to-list 'load-path
@@ -75,18 +68,18 @@
 ;;                  "icons"))
 
        )
+
+  ;; XEmacs.
   (if (not (fboundp 'make-glyph))
 
-(defmacro defezimage (variable imagespec docstring)
+      (defmacro defezimage (variable imagespec docstring)
   "Don't bother loading up an image...
 Argument VARIABLE is the variable to define.
 Argument IMAGESPEC is the list defining the image to create.
 Argument DOCSTRING is the documentation for VARIABLE."
   `(defvar ,variable nil ,docstring))
 
-;; ELSE
-(with-no-warnings
-(defun ezimage-find-image-on-load-path (image)
+    (defun ezimage-find-image-on-load-path (image)
   "Find the image file IMAGE on the load path."
   (let ((l (cons
            ;; In XEmacs, try the data directory first (for an
@@ -103,19 +96,16 @@
          ))
       (setq l (cdr l)))
     r))
-);with-no-warnings
 
-(with-no-warnings
-(defun ezimage-convert-emacs21-imagespec-to-xemacs (spec)
+    (defun ezimage-convert-emacs21-imagespec-to-xemacs (spec)
   "Convert the Emacs21 image SPEC into an XEmacs image spec.
 The Emacs 21 spec is what I first learned, and is easy to convert."
   (let* ((sl (car spec))
         (itype (nth 1 sl))
         (ifile (nth 3 sl)))
     (vector itype ':file (ezimage-find-image-on-load-path ifile))))
-);with-no-warnings
 
-(defmacro defezimage (variable imagespec docstring)
+    (defmacro defezimage (variable imagespec docstring)
   "Define VARIABLE as an image if `defimage' is not available.
 IMAGESPEC is the image data, and DOCSTRING is documentation for the image."
   `(progn
@@ -132,7 +122,7 @@
        ,docstring)
      (put ',variable 'ezimage t)))
 
-)))
+    )))
 
 (defezimage ezimage-directory
   ((:type xpm :file "ezimage/dir.xpm" :ascent center))
@@ -294,17 +284,15 @@
 Assumes the image is part of a GUI and can be clicked on.
 Optional argument STRING is a string upon which to add text properties."
   (when ezimage-use-images
-    (if (featurep 'xemacs)
        (add-text-properties start end
+                        (if (featurep 'xemacs)
                             (list 'end-glyph image
                                   'rear-nonsticky (list 'display)
                                   'invisible t
                                   'detachable t)
-                            string)
-      (add-text-properties start end
                           (list 'display image
-                                'rear-nonsticky (list 'display))
-                          string)))
+                                'rear-nonsticky (list 'display)))
+                        string))
   string)
 
 (defun ezimage-image-association-dump ()
@@ -357,12 +345,10 @@
   "Return a list of all variables containing ez images."
   (let ((ans nil))
     (mapatoms (lambda (sym)
-               (if (get sym 'ezimage) (setq ans (cons sym ans))))
-             )
+               (if (get sym 'ezimage) (setq ans (cons sym ans)))))
     (setq ans (sort ans (lambda (a b)
                          (string< (symbol-name a) (symbol-name b)))))
-    ans)
-  )
+    ans))
 
 (provide 'ezimage)