mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-23 10:34:07 +00:00
Fix TTY colors breakage by 'clear-face-cache'
Without examining the right frame, 'tty-color-24bit' was erroneously treating a GUI frame as a 24-bit TTY frame. * lisp/term/tty-colors.el (tty-color-24bit): Accept optional argument DISPLAY and pass it to display-color-cells. Doc fix. (tty-color-define, tty-color-desc): Pass the FRAME argument to tty-color-24bit. (Bug#32072)
This commit is contained in:
parent
f56ad422c4
commit
ba9b9bb4ac
@ -824,10 +824,12 @@ A canonicalized color name is all-lower case, with any blanks removed."
|
||||
(replace-regexp-in-string " +" "" (downcase color))
|
||||
color)))
|
||||
|
||||
(defun tty-color-24bit (rgb)
|
||||
"Return pixel value on 24-bit terminals. Return nil if RGB is
|
||||
nil or not on 24-bit terminal."
|
||||
(when (and rgb (= (display-color-cells) 16777216))
|
||||
(defun tty-color-24bit (rgb &optional display)
|
||||
"Return 24-bit color pixel value for RGB value on DISPLAY.
|
||||
DISPLAY can be a display name or a frame, and defaults to the
|
||||
selected frame's display.
|
||||
If DISPLAY is not on a 24-but TTY terminal, return nil."
|
||||
(when (and rgb (= (display-color-cells display) 16777216))
|
||||
(let ((r (lsh (car rgb) -8))
|
||||
(g (lsh (cadr rgb) -8))
|
||||
(b (lsh (nth 2 rgb) -8)))
|
||||
@ -850,7 +852,7 @@ If FRAME is not specified or is nil, it defaults to the selected frame."
|
||||
(error "Invalid specification for tty color \"%s\"" name))
|
||||
(tty-modify-color-alist
|
||||
(append (list (tty-color-canonicalize name)
|
||||
(or (tty-color-24bit rgb) index))
|
||||
(or (tty-color-24bit rgb frame) index))
|
||||
rgb)
|
||||
frame))
|
||||
|
||||
@ -1026,7 +1028,7 @@ might need to be approximated if it is not supported directly."
|
||||
(or (assoc color (tty-color-alist frame))
|
||||
(let ((rgb (tty-color-standard-values color)))
|
||||
(and rgb
|
||||
(let ((pixel (tty-color-24bit rgb)))
|
||||
(let ((pixel (tty-color-24bit rgb frame)))
|
||||
(or (and pixel (cons color (cons pixel rgb)))
|
||||
(tty-color-approximate rgb frame)))))))))
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user