diff options
| author | Glenn Morris | 2014-10-29 22:15:28 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-10-29 22:15:28 -0700 |
| commit | 52b410c60aebeb769ec9580af25ca50df2a44751 (patch) | |
| tree | ba5de0b896c5ea410ceb2f2f1866c0fac73ea236 /src/ChangeLog | |
| parent | cc99f920f507d28bb1422f8a3d52723ddc734c8a (diff) | |
| parent | 237bf45a48999d5a8a3617822dddf3ea305bc269 (diff) | |
| download | emacs-52b410c60aebeb769ec9580af25ca50df2a44751.tar.gz emacs-52b410c60aebeb769ec9580af25ca50df2a44751.zip | |
Merge from emacs-24; up to 117634
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 25009f8a310..89c0bb8fd8e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2014-10-30 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * fileio.c (Fexpand_file_name): Use make_unibyte_string, not | ||
| 4 | build_string, when importing a home directory. (Bug#18873) | ||
| 5 | |||
| 6 | * dispnew.c (buffer_posn_from_coords): Use | ||
| 7 | WINDOW_WANTS_HEADER_LINE_P, not WINDOW_WANTS_MODELINE_P, to | ||
| 8 | account for the header-line height. (Bug#18839) | ||
| 9 | |||
| 1 | 2014-10-28 Ulf Jasper <ulf.jasper@web.de> | 10 | 2014-10-28 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 11 | ||
| 3 | * xml.c (parse_region): Do not forget the first document child. | 12 | * xml.c (parse_region): Do not forget the first document child. |