[Emacs-diffs] /srv/bzr/emacs/trunk r99328: Fix bug#5313: editing files in hexl-mode corrupts file

[Juanma Barranquero]

------------------------------------------------------------
revno: 99328
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-14 15:37:13 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/hexl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-14 13:14:24 +0000
+++ b/lisp/ChangeLog    2010-01-14 14:37:13 +0000
@@ -1,5 +1,10 @@
 2010-01-14  Juanma Barranquero  <address@hidden>
 
+       * hexl.el (hexl-printable-character): Fix check of `hexl-iso',
+       which is always a string.  (Bug#5313)
+
+2010-01-14  Juanma Barranquero  <address@hidden>
+
        * progmodes/ada-xref.el (ada-default-prj-properties):
        Simplify previous change.
 

=== modified file 'lisp/hexl.el'
--- a/lisp/hexl.el      2010-01-13 08:35:10 +0000
+++ b/lisp/hexl.el      2010-01-14 14:37:13 +0000
@@ -779,11 +779,11 @@
 
 (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))))