diff options
| author | Chong Yidong | 2008-08-15 21:32:01 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-08-15 21:32:01 +0000 |
| commit | ef1fba80054c436b118c85bb8f62c10a8294775a (patch) | |
| tree | 3fa7e4068a46303a151d3ef31ae51c3ba251f767 /src | |
| parent | e933b15ea327efc3453520f1d5637b8404ff3e89 (diff) | |
| download | emacs-ef1fba80054c436b118c85bb8f62c10a8294775a.tar.gz emacs-ef1fba80054c436b118c85bb8f62c10a8294775a.zip | |
* xfaces.c (lookup_derived_face): Properly handle possible zero
return value of get_lface_attributes.
(merge_faces): Don't tell lookup_derived_face to signal an error
if face is not found.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5226f6579fb..197a01f5bcc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2008-08-15 Chong Yidong <cyd@stupidchicken.com> | 1 | 2008-08-15 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * xfaces.c (lookup_derived_face): Properly handle possible zero | ||
| 4 | return value of get_lface_attributes. | ||
| 5 | (merge_faces): Don't tell lookup_derived_face to signal an error | ||
| 6 | if face is not found. | ||
| 7 | |||
| 3 | * dired.c (Fdirectory_files): Doc fix. | 8 | * dired.c (Fdirectory_files): Doc fix. |
| 4 | 9 | ||
| 5 | * process.c (make_process): Initialize kill_without_query struct | 10 | * process.c (make_process): Initialize kill_without_query struct |