diff options
| author | Eli Zaretskii | 2014-12-13 10:00:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-12-13 10:00:31 +0200 |
| commit | c081fe29d709ede27b956567e7c733583f8f6c33 (patch) | |
| tree | 3ec7aca0aef5547f81cb332005789a2d42861a06 | |
| parent | d19bf72ac984f788764a09bc9f1002a9e10f71d0 (diff) | |
| download | emacs-c081fe29d709ede27b956567e7c733583f8f6c33.tar.gz emacs-c081fe29d709ede27b956567e7c733583f8f6c33.zip | |
Fix dates in ChangeLog entries merged from emacs-24.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | src/ChangeLog | 6 |
4 files changed, 11 insertions, 11 deletions
| @@ -6,14 +6,14 @@ | |||
| 6 | * src/alloc.c (XMALLOC_BASE_ALIGNMENT): Use max_align_t instead of | 6 | * src/alloc.c (XMALLOC_BASE_ALIGNMENT): Use max_align_t instead of |
| 7 | a hack involving a union. | 7 | a hack involving a union. |
| 8 | 8 | ||
| 9 | 2014-12-12 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2014-12-13 Paul Eggert <eggert@cs.ucla.edu> |
| 10 | 10 | ||
| 11 | Git ignore lib/std*.h | 11 | Git ignore lib/std*.h |
| 12 | * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and | 12 | * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and |
| 13 | stddef.h. Remove subsumed entries. | 13 | stddef.h. Remove subsumed entries. |
| 14 | Add !lib/std*.in.h, so as to not ignore the .in.h files. | 14 | Add !lib/std*.in.h, so as to not ignore the .in.h files. |
| 15 | 15 | ||
| 16 | 2014-12-11 Paul Eggert <eggert@cs.ucla.edu> | 16 | 2014-12-13 Paul Eggert <eggert@cs.ucla.edu> |
| 17 | 17 | ||
| 18 | Port commit-msg to mawk | 18 | Port commit-msg to mawk |
| 19 | Problem reported by Ted Zlatanov in: | 19 | Problem reported by Ted Zlatanov in: |
| @@ -29,7 +29,7 @@ | |||
| 29 | unprintable chars in diagnostics. Don't complain if a prefix | 29 | unprintable chars in diagnostics. Don't complain if a prefix |
| 30 | "fixup! " or "squash! " makes a summary line too long. | 30 | "fixup! " or "squash! " makes a summary line too long. |
| 31 | 31 | ||
| 32 | 2014-12-08 Paul Eggert <eggert@cs.ucla.edu> | 32 | 2014-12-13 Paul Eggert <eggert@cs.ucla.edu> |
| 33 | 33 | ||
| 34 | Port commit-message checking to FreeBSD 9. | 34 | Port commit-message checking to FreeBSD 9. |
| 35 | This fixes a bug reported by Jan Djärv in: | 35 | This fixes a bug reported by Jan Djärv in: |
| @@ -41,7 +41,7 @@ | |||
| 41 | ordinary text characters. | 41 | ordinary text characters. |
| 42 | Be less tricky about quoting "'" in a shell script. | 42 | Be less tricky about quoting "'" in a shell script. |
| 43 | 43 | ||
| 44 | 2014-12-05 Stefan Monnier <monnier@iro.umontreal.ca> | 44 | 2014-12-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 45 | 45 | ||
| 46 | * .gitignore: Ignore autosave files. | 46 | * .gitignore: Ignore autosave files. |
| 47 | 47 | ||
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index ad94751a790..8f06881adc4 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2014-12-11 Eli Zaretskii <eliz@gnu.org> | 1 | 2014-12-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * text.texi (Comparing Text): Prevent a text string from being | 3 | * text.texi (Comparing Text): Prevent a text string from being |
| 4 | broken between 2 lines. (Bug#19257) | 4 | broken between 2 lines. (Bug#19257) |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a41b5cc52aa..1ca2f222295 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,14 +1,14 @@ | |||
| 1 | 2014-12-12 Michael Albinus <michael.albinus@gmx.de> | 1 | 2014-12-13 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 2 | ||
| 3 | * simple.el (password-word-equivalents): Add "passcode", used for | 3 | * simple.el (password-word-equivalents): Add "passcode", used for |
| 4 | numeric secrets like PINs or RSA tokens. | 4 | numeric secrets like PINs or RSA tokens. |
| 5 | 5 | ||
| 6 | 2014-12-10 Michael Albinus <michael.albinus@gmx.de> | 6 | 2014-12-13 Michael Albinus <michael.albinus@gmx.de> |
| 7 | 7 | ||
| 8 | * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in | 8 | * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in |
| 9 | order to determine `tramp-own-remote-path'. | 9 | order to determine `tramp-own-remote-path'. |
| 10 | 10 | ||
| 11 | 2014-12-09 Fabián Ezequiel Gallina <fgallina@gnu.org> | 11 | 2014-12-13 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 12 | 12 | ||
| 13 | * progmodes/python.el (python-shell-parse-command): Quote | 13 | * progmodes/python.el (python-shell-parse-command): Quote |
| 14 | `python-shell-interpreter`. (Bug#19289) | 14 | `python-shell-interpreter`. (Bug#19289) |
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 |