aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2012-12-06 14:55:20 +0100
committerJoakim Verona2012-12-06 14:55:20 +0100
commit8ca9105c00616fe989177a576a8ddf202d44dfa1 (patch)
tree36792a60249b23f9a01ba03b50a818fc2047c1ec /src/ChangeLog
parentcb88e06834d66612e31a973e4b519b6dff697cce (diff)
parent1700db3c71ec3fde2e263b3325a5b5f5315a4ef9 (diff)
downloademacs-8ca9105c00616fe989177a576a8ddf202d44dfa1.tar.gz
emacs-8ca9105c00616fe989177a576a8ddf202d44dfa1.zip
auto upstream
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 542b2c0174a..2fefef1275b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
12012-12-06 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * frame.h (x_char_width, x_char_height): Remove prototypes.
4 * w32term.h (x_char_width, x_char_height): Likewise.
5 * xfns.c (x_char_width, x_char_height): Remove.
6 * w32fns.c (x_char_width, x_char_height): Likewise.
7 * nsfns.c (x_char_width, x_char_height): Likewise.
8 * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for
9 all window frames.
10 (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT.
11 * keyboard.c (command_loop_1): Remove prototype.
12 (command_loop_2, top_level_1): Add static to match prototype.
13
12012-12-06 Paul Eggert <eggert@cs.ucla.edu> 142012-12-06 Paul Eggert <eggert@cs.ucla.edu>
2 15
3 Fix a recently-introduced delete-process race condition. 16 Fix a recently-introduced delete-process race condition.