# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1200567311 -3600
# Node ID e70cc8a90e9043075a0e40fe9587d2c931fb618e
# Parent  01970033faa65b61e6fdd252967bccf4bbac491c# Parent  555e21a66d51b966860fc9a82a4e6a1cf40a78fe
Automated merge with ssh://aidan-guest@hg.debian.org//hg/xemacs/xemacs

diff -r 01970033faa6 -r e70cc8a90e90 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jan 17 11:52:45 2008 +0100
+++ b/lisp/ChangeLog	Thu Jan 17 11:55:11 2008 +0100
@@ -1,3 +1,10 @@
+2008-01-17  Mike Sperber  <mike@xemacs.org>
+
+	* files.el (insert-directory): Bind `coding-system-for-read' to
+	the `file-name' coding system.  (Previously, the default ended up
+	being undecided, which doesn't work well for UTF-8-based locales,
+	for example.)
+
 2008-01-16  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* keydefs.el (global-map): 
diff -r 01970033faa6 -r e70cc8a90e90 lisp/files.el
--- a/lisp/files.el	Thu Jan 17 11:52:45 2008 +0100
+++ b/lisp/files.el	Thu Jan 17 11:55:11 2008 +0100
@@ -4177,6 +4177,9 @@
 			file switches wildcard full-directory-p)))
      (t
       (let* ((beg (point))
+	     ;; on Unix, assume that ls will output in what the
+	     ;; file-name coding system specifies
+	     (coding-system-for-read (get-coding-system 'file-name))
 	     (result
 	      (if wildcard
 		  ;; Run ls in the directory of the file pattern we asked for.