Fix bug #8047 with require-final-newline in binary image buffers.

 image-mode.el (image-toggle-display-image): Set
 find-file-literally non-nil in buffers visiting binary image
 files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f65ec67e7b8e940cea76da3f1a4c7d81569e68b1..367e685dd1d7243b8cb3e4444bd601e185d9db91 100644 (file)
--- 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 190ca08722be7f558be0e0b066df6f5628883aba..64dcf9076aeef6aeaa43bde6805315a6bc47d3e6 100644 (file)
--- 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)