changeset 4402:e70cc8a90e90

Automated merge with ssh://aidan-guest@hg.debian.org//hg/xemacs/xemacs
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 17 Jan 2008 11:55:11 +0100
parents 01970033faa6 (current diff) 555e21a66d51 (diff)
children 7080e020d700 68d1ca56cffa
files
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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): 
--- 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.