2 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f65ec67e7b8..367e685dd1d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * image-mode.el (image-toggle-display-image): Set
+        find-file-literally non-nil in buffers visiting binary image
+        files.  (Bug#8047)
+
 2011-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (cd): Make completion obey cd-path (bug#7924).
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 190ca08722b..64dcf9076ae 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -505,6 +505,11 @@ was inserted."
     ;; This just makes the arrow displayed in the right fringe
     ;; area look correct when the image is wider than the window.
     (setq truncate-lines t)
+    ;; Disable adding a newline at the end of the image file when it
+    ;; is written with, e.g., C-x C-w.
+    (if (coding-system-equal (coding-system-base buffer-file-coding-system)
+                             'no-conversion)
+        (set (make-local-variable 'find-file-literally) t))
     ;; Allow navigation of large images
     (set (make-local-variable 'auto-hscroll-mode) nil)
     (setq image-type type)