diff options
| author | Alan Mackenzie | 2012-01-15 19:34:11 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2012-01-15 19:34:11 +0000 |
| commit | 44b0225ed09cfbc6cee7ed53c630988c342df806 (patch) | |
| tree | c2e9c9eb79d76db50179d0be46da54a82b751033 /src/ChangeLog | |
| parent | b493658e2c67e9ae41798edefd7cb9a264e53e99 (diff) | |
| parent | 97912defd376ad75ac582d073851a5a7a4d3cc12 (diff) | |
| download | emacs-44b0225ed09cfbc6cee7ed53c630988c342df806.tar.gz emacs-44b0225ed09cfbc6cee7ed53c630988c342df806.zip | |
Merge.
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 28910c5a556..eb03ef1357f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32fns.c (signal_user_input): Don't do a QUIT, to avoid | ||
| 4 | thrashing the stack of the thread. (Bug#9087) | ||
| 5 | |||
| 1 | 2012-01-12 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-01-12 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses. | 8 | * xdisp.c (rows_from_pos_range): Add parens as per gcc -Wparentheses. |