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
b768cdcd
Commit
b768cdcd
authored
Jul 05, 2011
by
Juanma Barranquero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lisp/server.el: Catch quit and close the connection (bug#8942).
parent
13aa217b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/server.el
lisp/server.el
+4
-1
No files found.
lisp/ChangeLog
View file @
b768cdcd
2011-07-04 Juanma Barranquero <lekktu@gmail.com>
* server.el (server-execute): Catch quit and call
`server-return-error' to pass the error back to emacsclient and
close the connection (bug#8942).
2011-07-04 Ken Manheimer <ken.manheimer@gmail.com>
* allout.el (allout-encrypt-unencrypted-on-saves): Do not provide
...
...
lisp/server.el
View file @
b768cdcd
...
...
@@ -1153,7 +1153,10 @@ The following commands are accepted by the client:
"When done with a buffer, type \\[server-edit]"
)))))
(
when
(
and
frame
(
null
tty-name
))
(
server-unselect-display
frame
)))
(
error
(
server-return-error
proc
err
)))))
((
quit
error
)
(
when
(
eq
(
car
err
)
'quit
)
(
message
"Quit emacsclient request"
))
(
server-return-error
proc
err
)))))
(
defun
server-return-error
(
proc
err
)
(
ignore-errors
...
...
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