diff options
Diffstat (limited to 'lib-src/emacsclient.c')
| -rw-r--r-- | lib-src/emacsclient.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index c2b0a80c670..94cfa85d3f1 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -169,8 +169,7 @@ int emacs_pid = 0; be used for the new frame */ const char *frame_parameters = NULL; -static void print_help_and_exit (void) NO_RETURN; -static void fail (void) NO_RETURN; +static _Noreturn void print_help_and_exit (void); struct option longopts[] = @@ -670,7 +669,7 @@ an empty string"); } -static void +static _Noreturn void print_help_and_exit (void) { /* Spaces and tabs are significant in this message; they're chosen so the @@ -718,7 +717,7 @@ Report bugs with M-x report-emacs-bug.\n", progname); defined-- exit with an errorcode. Uses argv, but gets it from the global variable main_argv. */ -static void +static _Noreturn void fail (void) { if (alternate_editor) @@ -1278,7 +1277,7 @@ set_local_socket (const char *local_socket_name) if (n > 0) { tmpdir = tmpdir_storage = xmalloc (n); - confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir, n); + confstr (_CS_DARWIN_USER_TEMP_DIR, tmpdir_storage, n); } else #endif @@ -1665,10 +1664,10 @@ main (int argc, char **argv) send_to_emacs (emacs_socket, " "); } - /* If using the current frame, send tty information to Emacs anyway. - In daemon mode, Emacs may need to occupy this tty if no other - frame is available. */ - if (tty || (current_frame && !eval)) + /* Unless we are certain we don't want to occupy the tty, send our + tty information to Emacs. For example, in daemon mode Emacs may + need to occupy this tty if no other frame is available. */ + if (!current_frame || !eval) { const char *tty_type, *tty_name; |