diff lisp/files.el @ 4453:29efd169efe7

Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 11 May 2008 11:24:01 +0200
parents 555e21a66d51
children 8cef85a39d2c
line wrap: on
line diff
--- a/lisp/files.el	Sun May 11 11:20:24 2008 +0200
+++ b/lisp/files.el	Sun May 11 11:24:01 2008 +0200
@@ -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.