aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2018-11-19 11:24:19 -0800
committerPaul Eggert2018-11-19 11:38:20 -0800
commit736f1b364f8d57f7f0ea358d9c024ca628a0dbec (patch)
tree72bd8e33570eb91a5b7de9c5c9a449ffaf827719 /lib-src
parentb944e88663c0c3086976188e1b3da6fc7f21261e (diff)
downloademacs-736f1b364f8d57f7f0ea358d9c024ca628a0dbec.tar.gz
emacs-736f1b364f8d57f7f0ea358d9c024ca628a0dbec.zip
emacsclient.c: reindent to fit in 80
* lib-src/emacsclient.c: Reindent slightly.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c28
1 files changed, 17 insertions, 11 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 153f65fc916..5c4e71a4925 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -293,7 +293,8 @@ w32_get_resource (HKEY predefined, const char *key, LPDWORD type)
293 char *result = NULL; 293 char *result = NULL;
294 DWORD cbData; 294 DWORD cbData;
295 295
296 if (RegOpenKeyEx (predefined, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) 296 if (RegOpenKeyEx (predefined, REG_ROOT, 0, KEY_READ, &hrootkey)
297 == ERROR_SUCCESS)
297 { 298 {
298 if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData) 299 if (RegQueryValueEx (hrootkey, key, NULL, NULL, NULL, &cbData)
299 == ERROR_SUCCESS) 300 == ERROR_SUCCESS)
@@ -695,7 +696,8 @@ fail (void)
695 { 696 {
696 /* Allocate new token. */ 697 /* Allocate new token. */
697 ++toks; 698 ++toks;
698 new_argv = xrealloc (new_argv, new_argv_size + toks * sizeof (char *)); 699 new_argv = xrealloc (new_argv,
700 new_argv_size + toks * sizeof (char *));
699 701
700 /* Skip leading delimiters, and set separator, skipping any 702 /* Skip leading delimiters, and set separator, skipping any
701 opening quote. */ 703 opening quote. */
@@ -731,8 +733,8 @@ main (int argc, char **argv)
731 main_argc = argc; 733 main_argc = argc;
732 main_argv = argv; 734 main_argv = argv;
733 progname = argv[0]; 735 progname = argv[0];
734 message (true, "%s: Sorry, the Emacs server is supported only\n" 736 message (true, ("%s: Sorry, the Emacs server is supported only\n"
735 "on systems with Berkeley sockets.\n", 737 "on systems with Berkeley sockets.\n"),
736 argv[0]); 738 argv[0]);
737 fail (); 739 fail ();
738} 740}
@@ -1339,9 +1341,10 @@ set_local_socket (const char *local_socket_name)
1339 /* `stat' failed */ 1341 /* `stat' failed */
1340 if (saved_errno == ENOENT) 1342 if (saved_errno == ENOENT)
1341 message (true, 1343 message (true,
1342 "%s: can't find socket; have you started the server?\n\ 1344 ("%s: can't find socket; have you started the server?\n"
1343To start the server in Emacs, type \"M-x server-start\".\n", 1345 "%s: To start the server in Emacs,"
1344 progname); 1346 " type \"M-x server-start\".\n"),
1347 progname, progname);
1345 else 1348 else
1346 message (true, "%s: can't stat %s: %s\n", 1349 message (true, "%s: can't stat %s: %s\n",
1347 progname, server.sun_path, strerror (saved_errno)); 1350 progname, server.sun_path, strerror (saved_errno));
@@ -1530,10 +1533,13 @@ start_daemon_and_retry_set_socket (void)
1530 } 1533 }
1531 1534
1532 /* Try connecting, the daemon should have started by now. */ 1535 /* Try connecting, the daemon should have started by now. */
1533 message (true, "Emacs daemon should have started, trying to connect again\n"); 1536 message (true,
1537 "Emacs daemon should have started, trying to connect again\n");
1538
1534 if ((emacs_socket = set_socket (1)) == INVALID_SOCKET) 1539 if ((emacs_socket = set_socket (1)) == INVALID_SOCKET)
1535 { 1540 {
1536 message (true, "Error: Cannot connect even after starting the Emacs daemon\n"); 1541 message (true, ("Error: Cannot connect "
1542 "even after starting the Emacs daemon\n"));
1537 exit (EXIT_FAILURE); 1543 exit (EXIT_FAILURE);
1538 } 1544 }
1539 } 1545 }
@@ -1661,8 +1667,8 @@ main (int argc, char **argv)
1661 1667
1662 if (! (optind < argc || eval || create_frame)) 1668 if (! (optind < argc || eval || create_frame))
1663 { 1669 {
1664 message (true, "%s: file name or argument required\n" 1670 message (true, ("%s: file name or argument required\n"
1665 "Try '%s --help' for more information\n", 1671 "Try '%s --help' for more information\n"),
1666 progname, progname); 1672 progname, progname);
1667 exit (EXIT_FAILURE); 1673 exit (EXIT_FAILURE);
1668 } 1674 }