bug#4157: 23.1.50; faulty character characterisation for ä

[Stefan Kangas <stefan@marxist.se>]

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

Stefan Kangas <stefan@marxist.se> writes:

> How about something like the attached diff?  Would that be a
> reasonable approach?

Fixed a typo in the attached.

Best regards,
Stefan Kangas

[-- Attachment #2: setlang2.diff --]
[-- Type: application/octet-stream, Size: 1658 bytes --]

diff --git a/lisp/dired.el b/lisp/dired.el
index 6e48d28b4c..f7c8f853b9 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1280,6 +1280,22 @@ dired-switches-recursive-p
   "Return non-nil if the string SWITCHES contains -R or --recursive."
   (dired-check-switches switches "R" "recursive"))
 
+(defmacro dired--with-encoding (encoding remote &rest body)
+  "Temporarily set LANG environment variable to ENCODING and run BODY.
+If REMOTE is non-nil, just run BODY."
+  (declare (indent 2))
+  `(if (not remote)
+       (let ((orig (getenv "LANG"))
+             (new orig))
+         (unwind-protect
+             (progn
+               (while (string-match "\\.\\([^.@]+\\)" new)
+                 (setq new (replace-match encoding nil nil new)))
+               (setenv "LANG" new)
+               ,@body)
+           (setenv "LANG" orig)))
+     ,@body))
+
 (defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
   "Insert a directory listing of DIR, Dired style.
 Use SWITCHES to make the listings.
@@ -1330,8 +1346,9 @@ dired-insert-directory
                             (executable-find "sh")))
                     (switch (if remotep "-c" shell-command-switch)))
                (unless
-                   (zerop
-                    (process-file sh nil (current-buffer) nil switch script))
+                   (dired--with-encoding "UTF-8" remotep
+                     (zerop
+                      (process-file sh nil (current-buffer) nil switch script)))
                  (user-error
                   "%s: No files matching wildcard" (cdr dir-wildcard)))
                (insert-directory-clean (point) switches)))