Show
Ignore:
Timestamp:
09/09/06 16:30:10 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/image-mode.el

    r4131 r4161  
    6161  (use-local-map image-mode-map) 
    6262  (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t) 
    63   (if (not (get-text-property (point-min) 'display)) 
     63  (if (and (display-images-p) 
     64           (not (get-text-property (point-min) 'display))) 
    6465      (image-toggle-display) 
    6566    ;; Set next vars when image is already displayed but local 
    …… 
    6768    (setq cursor-type nil truncate-lines t)) 
    6869  (run-mode-hooks 'image-mode-hook) 
    69   (message "%s" (concat (substitute-command-keys 
    70                     "Type \\[image-toggle-display] to view the image as ") 
    71                    (if (get-text-property (point-min) 'display) 
    72                        "text" "an image") "."))) 
     70  (if (display-images-p) 
     71      (message "%s" (concat 
     72                     (substitute-command-keys 
     73                      "Type \\[image-toggle-display] to view the image as ") 
     74                     (if (get-text-property (point-min) 'display) 
     75                         "text" "an image") ".")))) 
    7376 
    7477;;;###autoload