There's no reason not to compile version.el

[gnu-emacs] / lisp / hexl.el

diff --git a/lisp/hexl.el b/lisp/hexl.el
index f8ab156d9eb60623667581988a528bbb6624109c..bedcc6b10b9655fb43bb6e469c53ca54575c1186 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -222,7 +222,7 @@ as that will override any bit grouping options set here."
      (2 'hexl-ascii-region t t)))
   "Font lock keywords used in `hexl-mode'.")
 
-(defun hexl-rulerise (string bits)
+(defun hexl-rulerize (string bits)
   (let ((size (/ bits 4)) (strlen (length string)) (pos 0) (ruler ""))
     (while (< pos strlen)
       (setq ruler (concat ruler " " (substring string pos (+ pos size))))
@@ -234,7 +234,7 @@ as that will override any bit grouping options set here."
    (lambda (bits)
      (cons bits
            (concat " 87654321  "
-                   (hexl-rulerise "00112233445566778899aabbccddeeff" bits)
+                   (hexl-rulerize "00112233445566778899aabbccddeeff" bits)
                    "  0123456789abcdef")))
    '(8 16 32 64)))
 ;; routines
@@ -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)