diff options
| author | Glenn Morris | 2012-11-12 18:25:59 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-11-12 18:25:59 -0800 |
| commit | f78ee6afc094cdfd6162bfd645836e84875dcddf (patch) | |
| tree | 3a2c4f5d6441e53adadb69ed2af0b64abf3cf239 /src/ChangeLog | |
| parent | b95a9c0cba301ef8f1920a1d123ccd6873c14a63 (diff) | |
| parent | f8705f6e3102454bf1e3213956eb3ac8160ff047 (diff) | |
| download | emacs-f78ee6afc094cdfd6162bfd645836e84875dcddf.tar.gz emacs-f78ee6afc094cdfd6162bfd645836e84875dcddf.zip | |
Merge from emacs-24; up to 2012-11-09T14:45:15Z!dmantipov@yandex.ru
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5905c667852..88352c201b6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2012-11-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (decode_mode_spec): Limit the value of WIDTH argument | ||
| 4 | passed to pint2str and pint2hrstr to be at most the size of the | ||
| 5 | frame's decode_mode_spec_buffer. This avoids crashes with very | ||
| 6 | large values of FIELD_WIDTH argument to decode_mode_spec. | ||
| 7 | (Bug#12867) | ||
| 8 | |||
| 1 | 2012-11-13 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2012-11-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 10 | ||
| 3 | Fix a race with verify-visited-file-modtime (Bug#12863). | 11 | Fix a race with verify-visited-file-modtime (Bug#12863). |