* hexl.el (hexl-insert-char): Make display sizes other than 16 work.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8fc25121fd4586cf94731c7d80780b43f47fd20..f6213bbd186b9a70ea1c1ee996c61d8f4a617181 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-13  Vivek Dasmohapatra  <vivek@etla.org>
+
+       * hexl.el (hexl-insert-char): Make display sizes other than 16 work.
+
 2012-04-13  Masatake YAMATO  <yamato@redhat.com>
 
        * minibuffer.el (minibuffer-local-filename-syntax): New variable

diff --git a/lisp/hexl.el b/lisp/hexl.el
index f8ab156d9eb60623667581988a528bbb6624109c..6c4d8d6dc34b45fe75c0f8f80c236d5c6bddfa69 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -964,11 +964,7 @@ CH must be a unibyte character whose value is between 0 and 255."
       (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)