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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/18 04:08:05

Index: image-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-mode.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- image-mode.el       1 Feb 2008 01:43:36 -0000       1.34
+++ image-mode.el       18 Feb 2008 04:08:04 -0000      1.35
@@ -88,6 +88,12 @@
    'nomini
    (selected-frame)))
 
+(defun image-get-display-property ()
+  (get-char-property (point-min) 'display
+                     ;; There might be different images for different displays.
+                     (if (eq (window-buffer) (current-buffer))
+                         (selected-window))))
+
 (defun image-forward-hscroll (&optional n)
   "Scroll image in current window to the left by N character widths.
 Stop if the right edge of the image is reached."
@@ -97,7 +103,7 @@
         (image-set-window-hscroll (selected-window)
                                   (max 0 (+ (window-hscroll) n))))
        (t
-        (let* ((image (get-char-property (point-min) 'display))
+        (let* ((image (image-get-display-property))
                (edges (window-inside-edges))
                (win-width (- (nth 2 edges) (nth 0 edges)))
                (img-width (ceiling (car (image-size image)))))
@@ -120,7 +126,7 @@
         (image-set-window-vscroll (selected-window)
                                   (max 0 (+ (window-vscroll) n))))
        (t
-        (let* ((image (get-char-property (point-min) 'display))
+        (let* ((image (image-get-display-property))
                (edges (window-inside-edges))
                (win-height (- (nth 3 edges) (nth 1 edges)))
                (img-height (ceiling (cdr (image-size image)))))
@@ -194,7 +200,7 @@
   (and arg
        (/= (setq arg (prefix-numeric-value arg)) 1)
        (image-next-line (- arg 1)))
-  (let* ((image (get-char-property (point-min) 'display))
+  (let* ((image (image-get-display-property))
         (edges (window-inside-edges))
         (win-width (- (nth 2 edges) (nth 0 edges)))
         (img-width (ceiling (car (image-size image)))))
@@ -210,7 +216,7 @@
 (defun image-eob ()
   "Scroll to the bottom-right corner of the image in the current window."
   (interactive)
-  (let* ((image (get-char-property (point-min) 'display))
+  (let* ((image (image-get-display-property))
         (edges (window-inside-edges))
         (win-width (- (nth 2 edges) (nth 0 edges)))
         (img-width (ceiling (car (image-size image))))
@@ -271,7 +277,7 @@
 
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
   (if (and (display-images-p)
-          (not (get-char-property (point-min) 'display)))
+          (not (image-get-display-property)))
       (image-toggle-display)
     ;; Set next vars when image is already displayed but local
     ;; variables were cleared by kill-all-local-variables
@@ -282,7 +288,7 @@
       (message "%s" (concat
                     (substitute-command-keys
                      "Type \\[image-toggle-display] to view as ")
-                    (if (get-char-property (point-min) 'display)
+                    (if (image-get-display-property)
                         "text" "an image") "."))))
 
 ;;;###autoload
@@ -295,13 +301,13 @@
   :version "22.1"
   (if (not image-minor-mode)
       (image-toggle-display-text)
-    (if (get-char-property (point-min) 'display)
+    (if (image-get-display-property)
        (setq cursor-type nil truncate-lines t)
       (setq image-type "text"))
     (add-hook 'change-major-mode-hook (lambda () (image-minor-mode -1)) nil t)
     (message "%s" (concat (substitute-command-keys
                           "Type \\[image-toggle-display] to view the image as 
")
-                         (if (get-char-property (point-min) 'display)
+                         (if (image-get-display-property)
                              "text" "an image") "."))))
 
 ;;;###autoload
@@ -331,7 +337,7 @@
 
 (defun image-toggle-display-text ()
   "Showing the text of the image file."
-  (if (get-char-property (point-min) 'display)
+  (if (image-get-display-property)
       (image-toggle-display)))
 
 (defvar archive-superior-buffer)
@@ -342,7 +348,7 @@
 This command toggles between showing the text of the image file
 and showing the image as an image."
   (interactive)
-  (if (get-char-property (point-min) 'display)
+  (if (image-get-display-property)
       (let ((inhibit-read-only t)
            (buffer-undo-list t)
            (modified (buffer-modified-p)))