diff options
| author | Chong Yidong | 2011-07-22 11:23:10 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-07-22 11:23:10 -0400 |
| commit | f7912160c498869e56edc5472b94106fd772fb8d (patch) | |
| tree | 7ac8b67700fe9d4e5f2a1961dfb06ca7f4b5edf2 /src/ChangeLog | |
| parent | 17c87e18e5410b7077757f9852a2bb0e0cde54c6 (diff) | |
| download | emacs-f7912160c498869e56edc5472b94106fd772fb8d.tar.gz emacs-f7912160c498869e56edc5472b94106fd772fb8d.zip | |
Merge fix for Bug#4238 from trunk
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 84280a9a90f..09a6180e79d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-22 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * frame.c (Fmodify_frame_parameters): In tty case, update the | ||
| 4 | default face if necessary (Bug#4238). | ||
| 5 | |||
| 1 | 2011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie so as to suppress | 8 | * s/darwin.h (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie so as to suppress |