diff options
| author | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /src/ChangeLog.12 | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog.12')
| -rw-r--r-- | src/ChangeLog.12 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 2b22690bb87..053baa3d487 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | 69 | ||
| 70 | * dispnew.c (update_window): Use MATRIX_ROW and MATRIX_MODE_LINE_ROW. | 70 | * dispnew.c (update_window): Use MATRIX_ROW and MATRIX_MODE_LINE_ROW. |
| 71 | 71 | ||
| 72 | 2013-03-10 handa <handa@gnu.org> | 72 | 2013-03-10 Kenichi Handa <handa@gnu.org> |
| 73 | 73 | ||
| 74 | * lisp.h (adjust_after_replace): Extern it. | 74 | * lisp.h (adjust_after_replace): Extern it. |
| 75 | 75 | ||
| @@ -11043,7 +11043,7 @@ | |||
| 11043 | * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't | 11043 | * nsterm.m (x_free_frame_resources): Move xfree so freed memory isn't |
| 11044 | referenced (Bug#11583). | 11044 | referenced (Bug#11583). |
| 11045 | 11045 | ||
| 11046 | 2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com> | 11046 | 2012-06-16 Aurélien Aptel <aurelien.aptel@gmail.com> |
| 11047 | 11047 | ||
| 11048 | Implement wave-style variant of underlining. | 11048 | Implement wave-style variant of underlining. |
| 11049 | * dispextern.h (face_underline_type): New enum. | 11049 | * dispextern.h (face_underline_type): New enum. |
| @@ -21400,7 +21400,7 @@ | |||
| 21400 | 21400 | ||
| 21401 | * process.c (Fformat_network_address): Doc fix. | 21401 | * process.c (Fformat_network_address): Doc fix. |
| 21402 | 21402 | ||
| 21403 | 2011-04-08 T.V. Raman <tv.raman.tv@gmail.com> (tiny change) | 21403 | 2011-04-08 T. V. Raman <tv.raman.tv@gmail.com> (tiny change) |
| 21404 | 21404 | ||
| 21405 | * xml.c (parse_region): Avoid creating spurious whitespace nodes. | 21405 | * xml.c (parse_region): Avoid creating spurious whitespace nodes. |
| 21406 | 21406 | ||