From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 25 Feb 2011 23:39:18 +0000 (-0800)
Subject: * emacsclient.c (main): Avoid dangling 'if'.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~726^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e6bb4c94c9b4d78d9e626f32fc930cd76169e76;p=emacs.git

* emacsclient.c (main): Avoid dangling 'if'.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5b8033d2aec..d1203b2ff96 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* emacsclient.c (main): Avoid dangling 'if'.
+
 	* emacsclient.c: Redo local variables to avoid shadowing problems.
 	(message, socket_status, start_daemon_and_retry_set_socket):
 	Rename locals.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 070d6370714..b0087c124ec 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1543,21 +1543,21 @@ main (int argc, char **argv)
       null_server_file = (server_file == NULL);
     }
 
-  if ((emacs_socket = set_socket (alternate_editor
-				  || start_daemon_if_needed)) == INVALID_SOCKET)
-    if (start_daemon_if_needed)
-      {
-	/* Reset socket_name and server_file if they were NULL
-	   before the set_socket call.  */
-	if (null_socket_name)
-	  socket_name = NULL;
-	if (null_server_file)
-	  server_file = NULL;
-
-	start_daemon_and_retry_set_socket ();
-      }
-    else
-      fail ();
+  emacs_socket = set_socket (alternate_editor || start_daemon_if_needed);
+  if (emacs_socket == INVALID_SOCKET)
+    {
+      if (! start_daemon_if_needed)
+	fail ();
+
+      /* Reset socket_name and server_file if they were NULL
+	 before the set_socket call.  */
+      if (null_socket_name)
+	socket_name = NULL;
+      if (null_server_file)
+	server_file = NULL;
+
+      start_daemon_and_retry_set_socket ();
+    }
 
   cwd = get_current_dir_name ();
   if (cwd == 0)