diff options
| author | Juanma Barranquero | 2008-01-25 15:46:07 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-01-25 15:46:07 +0000 |
| commit | 5ab73228619adb09dea84e4abf01a11cf5a6f024 (patch) | |
| tree | 361e0da01c9416dbbf28fcc2f2e6feb45c8270e8 /lib-src | |
| parent | 38b9f0f370787df00241e25cdb83aa4373801d60 (diff) | |
| download | emacs-5ab73228619adb09dea84e4abf01a11cf5a6f024.tar.gz emacs-5ab73228619adb09dea84e4abf01a11cf5a6f024.zip | |
(set_tcp_socket): Don't send a "\n" after the authentication string;
there's no need to haste.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 05d8af126bb..c1fb7e9293f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-01-25 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * emacsclient.c (set_tcp_socket): Don't send "\n" after | ||
| 4 | the authentication string; there's no need to haste. | ||
| 5 | |||
| 1 | 2008-01-22 Chong Yidong <cyd@stupidchicken.com> | 6 | 2008-01-22 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * pop.c (pop_stat, pop_last): Fix last fix. | 8 | * pop.c (pop_stat, pop_last): Fix last fix. |
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 568b6c18119..b8ab19721ff 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -229,7 +229,7 @@ xstrdup (const char *s) | |||
| 229 | 229 | ||
| 230 | 230 | ||
| 231 | /* Return the current working directory. Returns NULL on errors. | 231 | /* Return the current working directory. Returns NULL on errors. |
| 232 | Any other returned value must be freed with free. This is used | 232 | Any other returned value must be freed with free. This is used |
| 233 | only when get_current_dir_name is not defined on the system. */ | 233 | only when get_current_dir_name is not defined on the system. */ |
| 234 | char* | 234 | char* |
| 235 | get_current_dir_name () | 235 | get_current_dir_name () |
| @@ -1010,7 +1010,7 @@ set_tcp_socket () | |||
| 1010 | 1010 | ||
| 1011 | send_to_emacs (s, "-auth "); | 1011 | send_to_emacs (s, "-auth "); |
| 1012 | send_to_emacs (s, auth_string); | 1012 | send_to_emacs (s, auth_string); |
| 1013 | send_to_emacs (s, "\n"); | 1013 | send_to_emacs (s, " "); |
| 1014 | 1014 | ||
| 1015 | return s; | 1015 | return s; |
| 1016 | } | 1016 | } |
| @@ -1100,7 +1100,7 @@ handle_sigtstp (int signalnum) | |||
| 1100 | if (emacs_socket) | 1100 | if (emacs_socket) |
| 1101 | send_to_emacs (emacs_socket, "-suspend \n"); | 1101 | send_to_emacs (emacs_socket, "-suspend \n"); |
| 1102 | 1102 | ||
| 1103 | /* Unblock this signal and call the default handler by temprarily | 1103 | /* Unblock this signal and call the default handler by temporarily |
| 1104 | changing the handler and resignalling. */ | 1104 | changing the handler and resignalling. */ |
| 1105 | sigprocmask (SIG_BLOCK, NULL, &set); | 1105 | sigprocmask (SIG_BLOCK, NULL, &set); |
| 1106 | sigdelset (&set, signalnum); | 1106 | sigdelset (&set, signalnum); |