Merge from origin/emacs-24

b544ab5 Fix return value of vertical-motion at ZV  (Bug#19553)
1f179ea Fix encoding of I/O in net-utils.el for MS-Windows.  (Bug#19458)
70f298f Fix the description of -nl in --help text.  (Bug#19542)

2 files changed, 24 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 570e3e248cc..1f356a00217 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * net/net-utils.el (net-utils-run-program, net-utils-run-simple):
+        On MS-Windows, bind coding-system-for-read to the console output
+        codepage.  (Bug#19458)
+
 2015-01-04  Dmitry Gutov  <dgutov@yandex.ru>
 
         Unbreak `mouse-action' property in text buttons.
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 28aa43117da..ebcbc714ffb 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -328,7 +328,15 @@ This variable is only used if the variable
 
 (defun net-utils-run-program (name header program args)
   "Run a network information program."
-  (let ((buf (get-buffer-create (concat "*" name "*"))))
+  (let ((buf (get-buffer-create (concat "*" name "*")))
+        (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-buffer buf)
     (erase-buffer)
     (insert header "\n")
@@ -352,7 +360,15 @@ This variable is only used if the variable
       (when proc
         (set-process-filter proc nil)
         (delete-process proc)))
-    (let ((inhibit-read-only t))
+    (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)))
       (erase-buffer))
     (net-utils-mode)
     (setq-local net-utils--revert-cmd