diff options
| author | Eli Zaretskii | 2013-04-05 16:10:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-05 16:10:57 +0300 |
| commit | eb1dd42a729ab1b9cdcd278767951679480cd4c3 (patch) | |
| tree | 7a9787eacf9fa495ad8f7caef59bb58a46fbe04a /lib-src | |
| parent | 86e9346005b957ddadb73586c9641e68ea12a79d (diff) | |
| parent | 2a417372c4a06fe90c343bc59660268c7a5ac3e9 (diff) | |
| download | emacs-eb1dd42a729ab1b9cdcd278767951679480cd4c3.tar.gz emacs-eb1dd42a729ab1b9cdcd278767951679480cd4c3.zip | |
Merge from trunk.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 10758d80872..2089a50d47b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -14,10 +14,6 @@ | |||
| 14 | (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: | 14 | (socket_connection) [!HAVE_KRB5_ERROR_TEXT && HAVE_KRB5_ERROR_E_TEXT]: |
| 15 | Use ERROR_MAX, not ERRMAX. | 15 | Use ERROR_MAX, not ERRMAX. |
| 16 | 16 | ||
| 17 | 2013-03-16 Glenn Morris <rgm@gnu.org> | ||
| 18 | |||
| 19 | * Version 24.3 released. | ||
| 20 | |||
| 21 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> | 17 | 2013-03-13 Paul Eggert <eggert@cs.ucla.edu> |
| 22 | 18 | ||
| 23 | File synchronization fixes (Bug#13944). | 19 | File synchronization fixes (Bug#13944). |
| @@ -3728,7 +3724,7 @@ | |||
| 3728 | 3724 | ||
| 3729 | 2002-03-05 Francesco Potortì <pot@gnu.org> | 3725 | 2002-03-05 Francesco Potortì <pot@gnu.org> |
| 3730 | 3726 | ||
| 3731 | * etags.c: Honour #line directives. | 3727 | * etags.c: Honor #line directives. |
| 3732 | (no_line_directive): New global var; set it for old behavior. | 3728 | (no_line_directive): New global var; set it for old behavior. |
| 3733 | (main): Remove some #ifdef in the getopt switch. | 3729 | (main): Remove some #ifdef in the getopt switch. |
| 3734 | (add_node, put_entries): Code added to merge different chunks of | 3730 | (add_node, put_entries): Code added to merge different chunks of |