Commit 248ec838 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix launching net-utils on MS-Windows

* lisp/net/net-utils.el (net-utils-run-simple): Bind
coding-system-for-read around the code which starts the process.
(Bug#48375)
parent 0a681590
Pipeline #10790 failed with stages
in 10 minutes and 14 seconds
......@@ -363,24 +363,24 @@ This variable is only used if the variable
(when proc
(set-process-filter proc nil)
(delete-process proc)))
(let ((inhibit-read-only t)
(coding-system-for-read
;; MS-Windows versions of network utilities output text
;; encoded in the console (a.k.a. "OEM") codepage, which is
;; different from the default system (a.k.a. "ANSI")
;; codepage.
(if (eq system-type 'windows-nt)
(intern (format "cp%d" (w32-get-console-output-codepage)))
coding-system-for-read)))
(let ((inhibit-read-only t))
(erase-buffer))
(net-utils-mode)
(setq-local net-utils--revert-cmd
`(net-utils-run-simple ,(current-buffer)
,program-name ,args nodisplay))
(set-process-filter
(apply #'start-process program-name
(current-buffer) program-name args)
#'net-utils-remove-ctrl-m-filter)
(let ((coding-system-for-read
;; MS-Windows versions of network utilities output text
;; encoded in the console (a.k.a. "OEM") codepage, which is
;; different from the default system (a.k.a. "ANSI")
;; codepage.
(if (eq system-type 'windows-nt)
(intern (format "cp%d" (w32-get-console-output-codepage)))
coding-system-for-read)))
(set-process-filter
(apply #'start-process program-name
(current-buffer) program-name args)
#'net-utils-remove-ctrl-m-filter))
(unless nodisplay (display-buffer (current-buffer)))))
(defun net-utils--revert-function (&optional _ignore-auto _noconfirm)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment