diff options
| author | Chong Yidong | 2009-12-05 22:49:00 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-12-05 22:49:00 +0000 |
| commit | 426ac9499e082e4ab83a18639fd45b720584f347 (patch) | |
| tree | cf52547f8d1cfb11b7505854fbe88405c8c83241 /src/ChangeLog | |
| parent | 9a594ee6eadd63fbf9daa69b701401c86aeddf01 (diff) | |
| download | emacs-426ac9499e082e4ab83a18639fd45b720584f347.tar.gz emacs-426ac9499e082e4ab83a18639fd45b720584f347.zip | |
* xdisp.c (push_display_prop): Don't set avoid_cursor_p. Return 0
if push failed.
(handle_line_prefix): Set avoid_cursor_p here. Check return value
of push_display_prop (Bug#5000).
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1909af820fb..aec5dc18286 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2009-12-05 Chong Yidong <cyd@stupidchicken.com> | 1 | 2009-12-05 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * xdisp.c (push_display_prop): Don't set avoid_cursor_p. Return 0 | ||
| 4 | if push failed. | ||
| 5 | (handle_line_prefix): Set avoid_cursor_p here. Check return value | ||
| 6 | of push_display_prop (Bug#5000). | ||
| 7 | |||
| 3 | * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return | 8 | * xfaces.c (Fx_family_fonts): Handle 2009-07-14 change to return |
| 4 | value of font_list_entities (Bug#5085). | 9 | value of font_list_entities (Bug#5085). |
| 5 | 10 | ||