diff options
| author | Eli Zaretskii | 2015-02-08 18:17:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-02-08 18:17:40 +0200 |
| commit | 20c817d3657ec67792edafd75f34d829144e8590 (patch) | |
| tree | da827bd286e203891f0f5b15409d635e24c21195 /src | |
| parent | eca7da109248c40963c285417b878a8abcd84049 (diff) | |
| download | emacs-20c817d3657ec67792edafd75f34d829144e8590.tar.gz emacs-20c817d3657ec67792edafd75f34d829144e8590.zip | |
Fix handling of frame color parameters in TTY sessions (Bug#19802)
src/xfaces.c (map_tty_color): Use assoc_no_quit instead of
assq_no_quit to fetch color definition by its string name.
lisp/frame.el (frame-notice-user-settings): Refresh the value of
frame parameters after calling tty-handle-reverse-video. Call
face-set-after-frame-default with the actual parameters, to avoid
resetting colors back to unspecified.
(set-background-color, set-foreground-color): Pass the selected
color to face-set-after-frame-default.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xfaces.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 135f28fb20f..7a7fd23d43d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-02-08 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xfaces.c (map_tty_color): Use assoc_no_quit instead of | ||
| 4 | assq_no_quit to fetch color definition by its string name. | ||
| 5 | (Bug#19802) | ||
| 6 | |||
| 1 | 2015-02-05 Eli Zaretskii <eliz@gnu.org> | 7 | 2015-02-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * xdisp.c (move_it_in_display_line_to): Handle the case where the | 9 | * xdisp.c (move_it_in_display_line_to): Handle the case where the |
diff --git a/src/xfaces.c b/src/xfaces.c index 44c72aa4944..29c91f7169f 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -5793,7 +5793,7 @@ map_tty_color (struct frame *f, struct face *face, | |||
| 5793 | if (STRINGP (color) | 5793 | if (STRINGP (color) |
| 5794 | && SCHARS (color) | 5794 | && SCHARS (color) |
| 5795 | && CONSP (Vtty_defined_color_alist) | 5795 | && CONSP (Vtty_defined_color_alist) |
| 5796 | && (def = assq_no_quit (color, call1 (Qtty_color_alist, frame)), | 5796 | && (def = assoc_no_quit (color, call1 (Qtty_color_alist, frame)), |
| 5797 | CONSP (def))) | 5797 | CONSP (def))) |
| 5798 | { | 5798 | { |
| 5799 | /* Associations in tty-defined-color-alist are of the form | 5799 | /* Associations in tty-defined-color-alist are of the form |