diff options
| author | Stefan Monnier | 2024-01-07 00:02:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2024-01-07 00:02:08 -0500 |
| commit | f866c85ac4e32df8061b285b6b44b15346994f3d (patch) | |
| tree | a42274585d97bd2095bbd2c0c441cb11c9abf26f | |
| parent | b5de9ae8010684a5ed0c6f2703077a61d325ccad (diff) | |
| download | emacs-f866c85ac4e32df8061b285b6b44b15346994f3d.tar.gz emacs-f866c85ac4e32df8061b285b6b44b15346994f3d.zip | |
(jsonrpc--log-event): Try and fix bug#68072
* lisp/jsonrpc.el (jsonrpc--log-event): Force the use of
`lisp-indent-function` in `pp-to-string`.
| -rw-r--r-- | lisp/jsonrpc.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index 3f33443f321..f0f5842a0ee 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el | |||
| @@ -1003,16 +1003,17 @@ of the API instead.") | |||
| 1003 | (or method "") | 1003 | (or method "") |
| 1004 | (if id (format "[%s]" id) ""))))) | 1004 | (if id (format "[%s]" id) ""))))) |
| 1005 | (msg | 1005 | (msg |
| 1006 | (cond ((eq format 'full) | 1006 | (pcase format |
| 1007 | (format "%s%s\n" preamble (or json log-text))) | 1007 | ('full (format "%s%s\n" preamble (or json log-text))) |
| 1008 | ((eq format 'short) | 1008 | ('short (format "%s%s\n" preamble (or log-text ""))) |
| 1009 | (format "%s%s\n" preamble (or log-text ""))) | 1009 | (_ |
| 1010 | (t | 1010 | (format "%s%s" preamble |
| 1011 | (format "%s%s" preamble | 1011 | (or (and foreign-message |
| 1012 | (or (and foreign-message | 1012 | (let ((lisp-indent-function ;bug#68072 |
| 1013 | (concat "\n" (pp-to-string | 1013 | #'lisp-indent-function)) |
| 1014 | foreign-message))) | 1014 | (concat "\n" (pp-to-string |
| 1015 | (concat log-text "\n"))))))) | 1015 | foreign-message)))) |
| 1016 | (concat log-text "\n"))))))) | ||
| 1016 | (goto-char (point-max)) | 1017 | (goto-char (point-max)) |
| 1017 | ;; XXX: could use `run-at-time' to delay server logs | 1018 | ;; XXX: could use `run-at-time' to delay server logs |
| 1018 | ;; slightly to play nice with verbose servers' stderr. | 1019 | ;; slightly to play nice with verbose servers' stderr. |