[Emacs-diffs] emacs/lisp files.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/12/26 15:01:10

Modified files:
        lisp           : files.el 

Log message:
        (dir-locals-find-file) [ms-dos]: Run dir-locals-file through
        dosified-file-name.  Compare files case-insensitively on systems whose
        filesystems are case-insensitive.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1026&r2=1.1027

Patches:
Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.1026
retrieving revision 1.1027
diff -u -b -r1.1026 -r1.1027
--- files.el    22 Dec 2008 20:11:51 -0000      1.1026
+++ files.el    26 Dec 2008 15:01:10 -0000      1.1027
@@ -3275,14 +3275,20 @@
 `dir-locals-directory-alist' is returned.
 Otherwise this returns nil."
   (setq file (expand-file-name file))
-  (let ((locals-file (locate-dominating-file file dir-locals-file))
+  (let* ((dir-locals-file-name
+         (if (eq system-type 'ms-dos)
+             (dosified-file-name dir-locals-file)
+           dir-locals-file))
+        (locals-file (locate-dominating-file file dir-locals-file-name))
        (dir-elt nil))
     ;; `locate-dominating-file' may have abbreviated the name.
     (when locals-file
-      (setq locals-file (expand-file-name dir-locals-file locals-file)))
+      (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
     (dolist (elt dir-locals-directory-alist)
       (when (and (eq t (compare-strings file nil (length (car elt))
-                                       (car elt) nil nil))
+                                       (car elt) nil nil
+                                       (memq system-type
+                                             '(windows-nt cygwin ms-dos))))
                 (> (length (car elt)) (length (car dir-elt))))
        (setq dir-elt elt)))
     (if (and locals-file dir-elt)