procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix encoding and display of messages sent by server to emacsclient

Browse source 
* lisp/server.el (server-start): Use 'locale-coding-system' to
encode messages sent back to the client.

* lib-src/emacsclient.c (main): Print '-error' messages via
'message', not directly via 'fprintf'.  This shows the error on
MS-Windows when the client is invoked as 'emacsclientw', since
stderr goes to the bit bucket in that case.
This commit is contained in:
Eli Zaretskii 2022-11-19 21:34:07 +02:00
parent 2ec39734ca
commit 1682bd18f5
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib-src/emacsclient.c
View file

@ -2240,7 +2240,7 @@ main (int argc, char **argv)
char *str = unquote_argument (p + strlen ("-error "));
if (!skiplf)
printf ("\n");
fprintf (stderr, "*ERROR*: %s", str);
message (true, "*ERROR*: %s", str);
if (str[0])
skiplf = str[strlen (str) - 1] == '\n';
exit_status = EXIT_FAILURE;

5
lisp/server.el
View file

@ -717,7 +717,10 @@ server or call `\\[server-force-delete]' to forcibly disconnect it."))
;; Those are decoded by server-process-filter according
;; to file-name-coding-system. Also don't get
;; confused by CRs since we don't quote them.
:coding 'raw-text-unix
;; For encoding, we must use the locale's encoding,
;; since emacsclient shows that verbatim on the
;; console.
:coding (cons 'raw-text-unix locale-coding-system)
;; The other args depend on the kind of socket used.
(if server-use-tcp
(list :family 'ipv4 ;; We're not ready for IPv6 yet