Fix bug#5313: editing files in hexl-mode corrupts file

* hexl.el (hexl-printable-character): Fix check of `hexl-iso',
  which is always a string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 833a25c39a8b452a99cb09c3c4141ce5a5cd262b..70bb9bce334ea086e9d469887234e6d8a63098cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+       * hexl.el (hexl-printable-character): Fix check of `hexl-iso',
+       which is always a string.  (Bug#5313)
+
 2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
 
        * progmodes/ada-xref.el (ada-default-prj-properties):

diff --git a/lisp/hexl.el b/lisp/hexl.el
index 2854ca12d45287262d58aad73a2251ac3f06a999..7edf5ec10ac8581a5ee50b0beff82098236e5fb9 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -779,11 +779,11 @@ This discards the buffer's undo information."
 
 (defun hexl-printable-character (ch)
   "Return a displayable string for character CH."
-  (format "%c" (if hexl-iso
-                  (if (or (< ch 32) (and (>= ch 127) (< ch 160)))
+  (format "%c" (if (equal hexl-iso "")
+                  (if (or (< ch 32) (>= ch 127))
                       46
                     ch)
-                (if (or (< ch 32) (>= ch 127))
+                (if (or (< ch 32) (and (>= ch 127) (< ch 160)))
                     46
                   ch))))