emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(lib): use ansi-color-apply

Browse source 
Rather than reimplement its face lookup (and have two versions of
doom-print-ansi-alist -- one for 27.x and one for 28+), let's just rely
on ansi-color.
This commit is contained in:
Henrik Lissner 2022-09-12 17:17:03 +02:00
parent 94ea4aa7dc
commit 26914d0369
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

68
lisp/lib/print.el
View file

@ -17,37 +17,38 @@
(defvar doom-print-ansi-alist (defvar doom-print-ansi-alist
'(;; fx '(;; fx
(bold 1 :weight bold) (bold . 1)
(dark 2) (dark . 2)
(italic 3 :slant italic) (italic . 3)
(underscore 4 :underline t) (underscore . 4)
(blink 5) (blink . 5)
(rapid 6) (rapid . 6)
(contrary 7) (contrary . 7)
(concealed 8) (concealed . 8)
(strike 9 :strike-through t) (strike . 9)
;; fg ;; fg
(black 30 term-color-black) (black . 30)
(red 31 term-color-red) (red . 31)
(green 32 term-color-green) (green . 32)
(yellow 33 term-color-yellow) (yellow . 33)
(blue 34 term-color-blue) (blue . 34)
(magenta 35 term-color-magenta) (magenta . 35)
(cyan 36 term-color-cyan) (cyan . 36)
(white 37 term-color-white) (white . 37)
;; bg ;; bg
(on-black 40 term-color-black) (on-black . 40)
(on-red 41 term-color-red) (on-red . 41)
(on-green 42 term-color-green) (on-green . 42)
(on-yellow 43 term-color-yellow) (on-yellow . 43)
(on-blue 44 term-color-blue) (on-blue . 44)
(on-magenta 45 term-color-magenta) (on-magenta . 45)
(on-cyan 46 term-color-cyan) (on-cyan . 46)
(on-white 47 term-color-white)) (on-white . 47))
"An alist of fg/bg/fx names mapped to ansi codes and term-color-* variables. "An alist of fg/bg/fx names mapped to ansi codes.
This serves as the cipher for converting (COLOR ...) function calls in `print!' This serves as the cipher for converting (COLOR ...) function calls in `print!'
and `format!' into colored output, where COLOR is any car of this list.") and `format!' into colored output, where COLOR is any car of this list (or
`doom-print-class-alist').")
(defvar doom-print-class-alist (defvar doom-print-class-alist
`((buffer . doom-print--buffer) `((buffer . doom-print--buffer)
@ -453,7 +454,7 @@ STYLE is a symbol that correlates to `doom-print-ansi-alist'.
In a noninteractive session, this wraps the result in ansi color codes. In a noninteractive session, this wraps the result in ansi color codes.
Otherwise, it maps colors to a term-color-* face." Otherwise, it maps colors to a term-color-* face."
(let* ((code (cadr (assq style doom-print-ansi-alist))) (let* ((code (cdr (assq style doom-print-ansi-alist)))
(format (format "%s" (or format ""))) (format (format "%s" (or format "")))
(message (if args (apply #'format format args) format))) (message (if args (apply #'format format args) format)))
(unless code (unless code
@ -462,16 +463,7 @@ Otherwise, it maps colors to a term-color-* face."
(`ansi (`ansi
(format "\e[0%dm%s\e[%dm" code message 0)) (format "\e[0%dm%s\e[%dm" code message 0))
(`text-properties (`text-properties
(require 'term) ; piggyback on term's color faces (ansi-color-apply message))
(propertize
message
'face
(append (get-text-property 0 'face format)
(cond ((>= code 40)
`(:background ,(caddr (assq style doom-print-ansi-alist))))
((>= code 30)
`(:foreground ,(face-foreground (caddr (assq style doom-print-ansi-alist)))))
((cddr (assq style doom-print-ansi-alist)))))))
(_ message)))) (_ message))))
;;;###autoload ;;;###autoload