aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorStefan Monnier2011-03-31 00:24:03 -0400
committerStefan Monnier2011-03-31 00:24:03 -0400
commit40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch)
treeb56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /lib-src/emacsclient.c
parentf488fb6528738131ef41859e1f04125f2e50efce (diff)
parent44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
downloademacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz
emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip
Merge from trunk
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index abc9aee37c1..737a8d88586 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1116,7 +1116,7 @@ socket_status (char *name)
1116/* A signal handler that passes the signal to the Emacs process. 1116/* A signal handler that passes the signal to the Emacs process.
1117 Useful for SIGWINCH. */ 1117 Useful for SIGWINCH. */
1118 1118
1119static SIGTYPE 1119static void
1120pass_signal_to_emacs (int signalnum) 1120pass_signal_to_emacs (int signalnum)
1121{ 1121{
1122 int old_errno = errno; 1122 int old_errno = errno;
@@ -1131,7 +1131,7 @@ pass_signal_to_emacs (int signalnum)
1131/* Signal handler for SIGCONT; notify the Emacs process that it can 1131/* Signal handler for SIGCONT; notify the Emacs process that it can
1132 now resume our tty frame. */ 1132 now resume our tty frame. */
1133 1133
1134static SIGTYPE 1134static void
1135handle_sigcont (int signalnum) 1135handle_sigcont (int signalnum)
1136{ 1136{
1137 int old_errno = errno; 1137 int old_errno = errno;
@@ -1157,7 +1157,7 @@ handle_sigcont (int signalnum)
1157 reality, we may get a SIGTSTP on C-z. Handling this signal and 1157 reality, we may get a SIGTSTP on C-z. Handling this signal and
1158 notifying Emacs about it should get things under control again. */ 1158 notifying Emacs about it should get things under control again. */
1159 1159
1160static SIGTYPE 1160static void
1161handle_sigtstp (int signalnum) 1161handle_sigtstp (int signalnum)
1162{ 1162{
1163 int old_errno = errno; 1163 int old_errno = errno;