[Emacs-diffs] Re: Changes to emacs/lisp/image-mode.el,v

[Kim F. Storm]

Chong Yidong <address@hidden> writes:

> CVSROOT:      /cvsroot/emacs
> Module name:  emacs
> Changes by:   Chong Yidong <cyd>      06/08/28 22:49:25
>
> Index: image-mode.el
> ===================================================================
> RCS file: /cvsroot/emacs/emacs/lisp/image-mode.el,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -b -r1.13 -r1.14
> --- image-mode.el     17 Jul 2006 20:55:07 -0000      1.13
> +++ image-mode.el     28 Aug 2006 22:49:25 -0000      1.14
> @@ -60,16 +60,20 @@
>    (setq major-mode 'image-mode)
>    (use-local-map image-mode-map)
>    (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
> -  (if (not (get-text-property (point-min) 'display))
> +  (let ((image-display-supported-p (memq window-system '(x w32 mac))))
> +    (if (and image-display-supported-p

Why not use (display-images-p) here?

> +          (not (get-text-property (point-min) 'display)))
>        (image-toggle-display)
>      ;; Set next vars when image is already displayed but local
>      ;; variables were cleared by kill-all-local-variables
>      (setq cursor-type nil truncate-lines t))
>    (run-mode-hooks 'image-mode-hook)
> -  (message "%s" (concat (substitute-command-keys
> +    (if image-display-supported-p
> +     (message "%s" (concat
> +                    (substitute-command-keys
>                   "Type \\[image-toggle-display] to view the image as ")
>                  (if (get-text-property (point-min) 'display)
> -                    "text" "an image") ".")))
> +                        "text" "an image") ".")))))
>  
>  ;;;###autoload
>  (define-minor-mode image-minor-mode

-- 
Kim F. Storm <address@hidden> http://www.cua.dk