diff options
| author | Miles Bader | 2007-10-27 09:07:17 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-10-27 09:07:17 +0000 |
| commit | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (patch) | |
| tree | 00f5484d576513deddd938a9a277d0db860b9a5b /lib-src/ChangeLog | |
| parent | ebe4c71027cd6ec8583631e895e7fdd3decfc099 (diff) | |
| parent | b6ff295c434269fe824ec47cbfc87c6a02dfd94d (diff) | |
| download | emacs-fdc9061358d3654e14bfc1419632e1d6c6c5c13e.tar.gz emacs-fdc9061358d3654e14bfc1419632e1d6c6c5c13e.zip | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index d4a05722a3c..14b668d2d24 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -8,6 +8,11 @@ | |||
| 8 | (set_local_socket, set_socket, main): Use egetenv, not getenv. | 8 | (set_local_socket, set_socket, main): Use egetenv, not getenv. |
| 9 | (w32_get_resource, w32_getenv) [WINDOWSNT]: New functions. | 9 | (w32_get_resource, w32_getenv) [WINDOWSNT]: New functions. |
| 10 | 10 | ||
| 11 | 2007-10-25 Jason Rumney <jasonr@gnu.org> | ||
| 12 | |||
| 13 | * emacsclient.c (sock_err_message): New function. | ||
| 14 | (set_tcp_socket): Use it. | ||
| 15 | |||
| 11 | 2007-10-09 Juanma Barranquero <lekktu@gmail.com> | 16 | 2007-10-09 Juanma Barranquero <lekktu@gmail.com> |
| 12 | 17 | ||
| 13 | * emacsclient.c (print_help_and_exit): Fix space to improve | 18 | * emacsclient.c (print_help_and_exit): Fix space to improve |