[Emacs-diffs] /srv/bzr/emacs/trunk r107896: * hexl.el (hexl-insert-char): Make display sizes other than 16 work.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 107896
author: Vivek Dasmohapatra <address@hidden>
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-14 00:31:23 +0200
message:
  * hexl.el (hexl-insert-char): Make display sizes other than 16 work.
modified:
  lisp/ChangeLog
  lisp/hexl.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-13 21:43:03 +0000
+++ b/lisp/ChangeLog    2012-04-13 22:31:23 +0000
@@ -1,3 +1,7 @@
+2012-04-13  Vivek Dasmohapatra  <address@hidden>
+
+       * hexl.el (hexl-insert-char): Make display sizes other than 16 work.
+
 2012-04-13  Masatake YAMATO  <address@hidden>
 
        * minibuffer.el (minibuffer-local-filename-syntax): New variable

=== modified file 'lisp/hexl.el'
--- a/lisp/hexl.el      2012-04-12 16:33:13 +0000
+++ b/lisp/hexl.el      2012-04-13 22:31:23 +0000
@@ -964,11 +964,7 @@
       (error "Invalid character 0x%x -- must be in the range [0..255]" ch))
   (let ((address (hexl-current-address t)))
     (while (> num 0)
-      (let ((hex-position
-            (+ (* (/ address 16) (hexl-line-displen))
-               10 (point-min)
-               (* 2 (% address 16))
-               (/ (% address 16) 2)))
+      (let ((hex-position (hexl-address-to-marker address))
            (ascii-position
             (+ (* (/ address 16) (hexl-line-displen))
                 (hexl-ascii-start-column)