diff options
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fd37eaefbec..f4bcc8a70e2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | 2014-12-12 Eli Zaretskii <eliz@gnu.org> | 1 | 2014-12-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move | 3 | * gnutls.c (Fgnutls_available_p, syms_of_gnutls): Move |
| 4 | gnutls-available-p out of the HAVE_GNUTLS conditional, and define | 4 | gnutls-available-p out of the HAVE_GNUTLS conditional, and define |
| 5 | them only once. | 5 | them only once. |
| 6 | 6 | ||
| 7 | 2014-12-11 Teodor Zlatanov <tzz@lifelogs.com> | 7 | 2014-12-13 Teodor Zlatanov <tzz@lifelogs.com> |
| 8 | 8 | ||
| 9 | * emacs.c (main): Always include gnutls.h and run syms_of_gnutls. | 9 | * emacs.c (main): Always include gnutls.h and run syms_of_gnutls. |
| 10 | 10 | ||
| @@ -15,7 +15,7 @@ | |||
| 15 | integration is not available, instead of erroring out. | 15 | integration is not available, instead of erroring out. |
| 16 | (Bug#19346) | 16 | (Bug#19346) |
| 17 | 17 | ||
| 18 | 2014-12-10 Eli Zaretskii <eliz@gnu.org> | 18 | 2014-12-13 Eli Zaretskii <eliz@gnu.org> |
| 19 | 19 | ||
| 20 | * xdisp.c (move_it_in_display_line_to, display_line): Don't | 20 | * xdisp.c (move_it_in_display_line_to, display_line): Don't |
| 21 | disallow overflow-newline-into-fringe when word-wrap is in | 21 | disallow overflow-newline-into-fringe when word-wrap is in |