diff options
| author | Kenichi Handa | 2014-01-11 22:00:54 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-01-11 22:00:54 +0900 |
| commit | af05bef2d1985fb9bd8485f3084f3bfe282a911f (patch) | |
| tree | 073c53ac52592c200d8b00e5458d4dc70c8647f4 /src/ChangeLog.12 | |
| parent | 3923e7bde942018135c7362c75327ffddcbd81fc (diff) | |
| parent | 02013850f638520bed0d6c3f77eb9c80e0f73983 (diff) | |
| download | emacs-af05bef2d1985fb9bd8485f3084f3bfe282a911f.tar.gz emacs-af05bef2d1985fb9bd8485f3084f3bfe282a911f.zip | |
merge trunk
Diffstat (limited to 'src/ChangeLog.12')
| -rw-r--r-- | src/ChangeLog.12 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 07aedadccae..a9a1d9b1326 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 | |||
| @@ -2400,7 +2400,7 @@ | |||
| 2400 | * w32term.h (x_char_width, x_char_height): Likewise. | 2400 | * w32term.h (x_char_width, x_char_height): Likewise. |
| 2401 | * xfns.c (x_char_width, x_char_height): Remove. | 2401 | * xfns.c (x_char_width, x_char_height): Remove. |
| 2402 | * w32fns.c (x_char_width, x_char_height): Likewise. | 2402 | * w32fns.c (x_char_width, x_char_height): Likewise. |
| 2403 | * nsfns.c (x_char_width, x_char_height): Likewise. | 2403 | * nsfns.m (x_char_width, x_char_height): Likewise. |
| 2404 | * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for | 2404 | * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for |
| 2405 | all window frames. | 2405 | all window frames. |
| 2406 | (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT. | 2406 | (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT. |