[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100484: Fix bug #8047 with require-final-newline and image file display.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100484
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-02-18 19:51:15 +0200
message:
  Fix bug #8047 with require-final-newline and image file display.
  
   image-mode.el (image-toggle-display-image): Disable
   require-final-newline in buffers visiting binary image files.
modified:
  lisp/ChangeLog
  lisp/image-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-18 15:43:22 +0000
+++ b/lisp/ChangeLog    2011-02-18 17:51:15 +0000
@@ -1,5 +1,9 @@
 2011-02-18  Eli Zaretskii  <address@hidden>
 
+       * image-mode.el (image-toggle-display-image): Disable
+       require-final-newline in buffers visiting binary image files.
+       (Bug#8047)
+
        * international/mule-cmds.el (read-char-by-name, ucs-insert):
        Document completion with asterisk and a substring.
 

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2011-01-02 23:50:46 +0000
+++ b/lisp/image-mode.el        2011-02-18 17:51:15 +0000
@@ -507,6 +507,11 @@
     ;; 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 'require-final-newline) nil))
     ;; Allow navigation of large images
     (set (make-local-variable 'auto-hscroll-mode) nil)
     (setq image-type type)