diff options
| author | Chong Yidong | 2008-07-05 21:15:39 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-07-05 21:15:39 +0000 |
| commit | 0a143d3a0fe2198b99418bda030cc46efbfd0e40 (patch) | |
| tree | 351cf857b4e4512f52d56ec22b21d2f8af1c1f17 | |
| parent | 2906a94c6bbe08e4381c7732688f7eebc2e956d4 (diff) | |
| download | emacs-0a143d3a0fe2198b99418bda030cc46efbfd0e40.tar.gz emacs-0a143d3a0fe2198b99418bda030cc46efbfd0e40.zip | |
* xfaces.c (Finternal_merge_in_global_face): Don't realize default
face if it didn't already exist.
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2bc832a4bd4..6ab19d76495 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-07-05 Chong Yidong <cyd@stupidchicken.com> | 1 | 2008-07-05 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * xfaces.c (Finternal_merge_in_global_face): Don't realize default | ||
| 4 | face if it didn't already exist. | ||
| 5 | |||
| 3 | * xdisp.c (try_window_id): Give up if word-wrapping is on. | 6 | * xdisp.c (try_window_id): Give up if word-wrapping is on. |
| 4 | 7 | ||
| 5 | 2008-07-05 Andreas Schwab <schwab@suse.de> | 8 | 2008-07-05 Andreas Schwab <schwab@suse.de> |