From: Vivek Dasmohapatra <vivek@etla.org>
Date: Fri, 13 Apr 2012 22:31:23 +0000 (+0200)
Subject: * hexl.el (hexl-insert-char): Make display sizes other than 16 work.
X-Git-Tag: emacs-24.2.90~471^2~364^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b472a59444c5ac74c85ccba53889b0c5a79324df;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8fc25121fd..f6213bbd186 100644
--- 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 f8ab156d9eb..6c4d8d6dc34 100644
--- 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)