Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7e6bb4c9
Commit
7e6bb4c9
authored
Feb 25, 2011
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* emacsclient.c (main): Avoid dangling 'if'.
parent
b0bbc07d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
15 deletions
+17
-15
lib-src/ChangeLog
lib-src/ChangeLog
+2
-0
lib-src/emacsclient.c
lib-src/emacsclient.c
+15
-15
No files found.
lib-src/ChangeLog
View file @
7e6bb4c9
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.
...
...
lib-src/emacsclient.c
View file @
7e6bb4c9
...
...
@@ -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_s
erver_fil
e
)
server_fil
e
=
NULL
;
s
tart_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_s
ocket_nam
e
)
socket_nam
e
=
NULL
;
if
(
null_server_file
)
s
erver_file
=
NULL
;
start_daemon_and_retry_set_socket
();
}
cwd
=
get_current_dir_name
();
if
(
cwd
==
0
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment