diff options
| author | K. Handa | 2016-01-03 17:53:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-03 17:53:43 +0900 |
| commit | fb6d826c69939c2d016c1b824d4e9bcb53d9e643 (patch) | |
| tree | b9ce862d6cbe25e740203421984df21e4cbadbf4 /src/ChangeLog.13 | |
| parent | 536f48e9a2251b9e654ea974bd90ff2f40218753 (diff) | |
| parent | 91917dd58ec5278e555b9c693a830749083e8f89 (diff) | |
| download | emacs-fb6d826c69939c2d016c1b824d4e9bcb53d9e643.tar.gz emacs-fb6d826c69939c2d016c1b824d4e9bcb53d9e643.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/ChangeLog.13')
| -rw-r--r-- | src/ChangeLog.13 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index ac2162830c4..fd68f5370ad 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 | |||
| @@ -8339,7 +8339,7 @@ | |||
| 8339 | * emacs.c (main): Initialize daemon_pipe[1] here ... | 8339 | * emacs.c (main): Initialize daemon_pipe[1] here ... |
| 8340 | (syms_of_emacs): ... instead of here. | 8340 | (syms_of_emacs): ... instead of here. |
| 8341 | 8341 | ||
| 8342 | 2014-02-16 Anders Lindgern <andlind@gmail.com> | 8342 | 2014-02-16 Anders Lindgren <andlind@gmail.com> |
| 8343 | 8343 | ||
| 8344 | * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask | 8344 | * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask |
| 8345 | is set (Bug#16505). | 8345 | is set (Bug#16505). |
| @@ -16566,7 +16566,7 @@ | |||
| 16566 | (ns_draw_fringe_bitmap): Remove unused rowY. | 16566 | (ns_draw_fringe_bitmap): Remove unused rowY. |
| 16567 | Change #if to COCOA && >= 10_6. | 16567 | Change #if to COCOA && >= 10_6. |
| 16568 | (ns_draw_window_cursor): Remove unused overspill. | 16568 | (ns_draw_window_cursor): Remove unused overspill. |
| 16569 | (ns_draw_underwave): width and x are EamcsCGFloat. | 16569 | (ns_draw_underwave): width and x are EmacsCGFloat. |
| 16570 | (ns_draw_box): thickness is CGFloat. | 16570 | (ns_draw_box): thickness is CGFloat. |
| 16571 | (ns_dumpglyphs_image): Change #if to COCOA && >= 10_6. | 16571 | (ns_dumpglyphs_image): Change #if to COCOA && >= 10_6. |
| 16572 | (ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread | 16572 | (ns_send_appdefined): When NS_IMPL_GNUSTEP, redirect to main thread |