diff options
| author | Eli Zaretskii | 2020-10-10 11:11:34 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-10-10 11:11:34 +0300 |
| commit | c00606171f88be0df2c19346fa53f401ea71c71f (patch) | |
| tree | da8b7a07ef63d9030f226fbfc210bb9161f2f2e3 /src/term.c | |
| parent | 3196fd44c36a5ce6789382f74442c461d9264471 (diff) | |
| download | emacs-c00606171f88be0df2c19346fa53f401ea71c71f.tar.gz emacs-c00606171f88be0df2c19346fa53f401ea71c71f.zip | |
A better fix for bug#43886
* src/xfaces.c (load_color2, Fcolor_distance): Revert last change.
* src/term.c (clear_tty_hooks): Don't clear defined_color_hook.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c index 94bf013f4a0..370f6fcd453 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -3842,7 +3842,9 @@ clear_tty_hooks (struct terminal *terminal) | |||
| 3842 | terminal->update_begin_hook = 0; | 3842 | terminal->update_begin_hook = 0; |
| 3843 | terminal->update_end_hook = 0; | 3843 | terminal->update_end_hook = 0; |
| 3844 | terminal->set_terminal_window_hook = 0; | 3844 | terminal->set_terminal_window_hook = 0; |
| 3845 | terminal->defined_color_hook = 0; | 3845 | /* Don't clear the defined_color_hook, as that makes it impossible |
| 3846 | to unload or load a theme when some TTY frame is suspended. */ | ||
| 3847 | /* terminal->defined_color_hook = 0; */ | ||
| 3846 | terminal->mouse_position_hook = 0; | 3848 | terminal->mouse_position_hook = 0; |
| 3847 | terminal->frame_rehighlight_hook = 0; | 3849 | terminal->frame_rehighlight_hook = 0; |
| 3848 | terminal->frame_raise_lower_hook = 0; | 3850 | terminal->frame_raise_lower_hook = 0; |