procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt hexl-mode to native line-number display

Browse source 
* lisp/hexl.el (hexl-mode-ruler): When display-line-numbers is in
effect, adjust offsets and columns to account for the line-number
display.  (Bug#31595)
This commit is contained in:
Eli Zaretskii 2018-05-30 20:30:07 +03:00
parent b8e7749b33
commit aa175a4058
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/hexl.el
View file

@ -1104,8 +1104,15 @@ This function is assumed to be used as callback function for `hl-line-mode'."
"Return a string ruler for Hexl mode."
(let* ((highlight (mod (hexl-current-address) 16))
(s (cdr (assq hexl-bits hexl-rulers)))
(pos 0))
(pos 0)
(lnum-width
(if display-line-numbers
(round (line-number-display-width 'columns))
0)))
(set-text-properties 0 (length s) nil s)
(when (> lnum-width 0)
(setq s (concat (make-string lnum-width ? ) s))
(setq pos (+ pos lnum-width)))
;; Turn spaces in the header into stretch specs so they work
;; regardless of the header-line face.
(while (string-match "[ \t]+" s pos)
@ -1116,10 +1123,11 @@ This function is assumed to be used as callback function for `hl-line-mode'."
s))
;; Highlight the current column.
(let ( (offset (+ (* 2 highlight) (/ (* 8 highlight) hexl-bits))) )
(if (> lnum-width 0) (setq offset (+ offset lnum-width)))
(put-text-property (+ 11 offset) (+ 13 offset) 'face 'highlight s))
;; Highlight the current ascii column
(put-text-property (+ (hexl-ascii-start-column) highlight 1)
(+ (hexl-ascii-start-column) highlight 2)
(put-text-property (+ (hexl-ascii-start-column) lnum-width highlight 1)
(+ (hexl-ascii-start-column) lnum-width highlight 2)
'face 'highlight s)
s))