2 files changed, 12 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76144f85d97..9b0e2e3be36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-02  Miles Bader  <miles@gnu.org>
+
+        * image-file.el (insert-image-file): When visiting an image,
+        suppress the cursor in the image buffer.
+
 2001-02-01  Dave Love  <fx@gnu.org>
 
         * progmodes/f90.el (f90-mode): Remove startup message.
diff --git a/lisp/image-file.el b/lisp/image-file.el
index 87314f3b90c..afee88d1346 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -110,6 +110,7 @@ the command `insert-file-contents'."
     (when (and (or (null beg) (zerop beg)) (null end))
       (let* ((ibeg (point))
              (iend (+ (point) (cadr rval)))
+             (visitingp (and visit (= ibeg (point-min)) (= iend (point-max))))
              (data
               (string-make-unibyte
                (buffer-substring-no-properties ibeg iend)))
@@ -122,11 +123,13 @@ the command `insert-file-contents'."
                         ;; This a cheap attempt to make the whole buffer
                         ;; read-only when we're visiting the file (as
                         ;; opposed to just inserting it).
-                        ,@(and visit
-                               (= ibeg (point-min))
-                               (= iend (point-max))
+                        ,@(and visitingp
                                '(read-only t front-sticky (read-only))))))
-        (add-text-properties ibeg iend props)))
+        (add-text-properties ibeg iend props)
+        (when visitingp
+          ;; Inhibit the cursor when the buffer contains only an image,
+          ;; because cursors look very strange on top of images.
+          (setq cursor-type nil))))
     rval))
 
 (defun image-file-handler (operation &rest args)