diff options
| author | Glenn Morris | 2014-11-03 16:49:37 -0500 |
|---|---|---|
| committer | Glenn Morris | 2014-11-03 16:49:37 -0500 |
| commit | 41e962982dfe424c69ed99f0bd26a6e4eb67107f (patch) | |
| tree | d7cda64bfecc7b9403459fda89b7f39a9fd8732f /src/ChangeLog | |
| parent | 303fd9411f21d19604306ecdbd89941bf4923201 (diff) | |
| parent | bd673cc594764572cd49bd0f10a0432006368489 (diff) | |
| download | emacs-41e962982dfe424c69ed99f0bd26a6e4eb67107f.tar.gz emacs-41e962982dfe424c69ed99f0bd26a6e4eb67107f.zip | |
Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f719681afb..6b62a60f7b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-11-03 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (Fdump_glyph_matrix, Fdump_frame_glyph_matrix): Doc fix. | ||
| 4 | (Fdump_frame_glyph_matrix): Don't segfault if invoked on a GUI | ||
| 5 | frame; instead, print an error message. | ||
| 6 | |||
| 7 | 2014-11-03 Jan Djärv <jan.h.d@swipnet.se> | ||
| 8 | |||
| 9 | * nsfns.m (ns_set_doc_edited): Check for FRAME_NS (Bug#18925). | ||
| 10 | |||
| 1 | 2014-11-02 Jan Djärv <jan.h.d@swipnet.se> | 11 | 2014-11-02 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 12 | ||
| 3 | * nsimage.m (allocInitFromFile:): Initialize bmRep. | 13 | * nsimage.m (allocInitFromFile:): Initialize bmRep. |