(dired-insert-directory): Don't override the user's locale.

(dired-standard-move-to-filename-regexp): Var deleted.

diff --git a/lisp/dired.el b/lisp/dired.el
index 4ba832a7ffe5c942e6d2f33ba32fd3357137f6b2..428994a9f50e74c3faa55df8aa9eb49445c0aaae 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -598,17 +598,9 @@ If DIRNAME is already in a dired buffer, that buffer is used without refresh."
   (let ((opoint (point))
        (process-environment (copy-sequence process-environment))
        end)
-    ;; This makes sure that month names come out in English
-    ;; so we can find the start of the file name.
-    ;; But if the user has customized the way of finding the file name,
-    ;; this is not necessary.
-    (if (and (equal dired-move-to-filename-regexp
-                   dired-standard-move-to-filename-regexp)
-            ;; It also isn't necessary if we'd use the C locale anyway.
-            (not (equal (or (getenv "LC_ALL") (getenv "LC_TIME")
-                            (getenv "LANGUAGE") (getenv "LANG") "C")
-                        "C")))
-       (setq process-environment (cons "LC_ALL=C" process-environment)))
+    ;; We used to specify the C locale here, to force English month names;
+    ;; but this should not be necessary any more,
+    ;; with the new value of dired-move-to-filename-regexp.
     (if (consp dir-or-list)
        ;; In this case, use the file names in the cdr
        ;; exactly as originally given to dired-noselect.
@@ -1309,10 +1301,6 @@ Optional arg GLOBAL means to replace all matches."
  [ 0-9][0-9][:0-9][0-9][ 0-9] "
   "Regular expression to match a month abbreviation followed date/time.")
 
-(defconst dired-standard-move-to-filename-regexp
-  "\\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|Sep\\|Oct\\|Nov\\|Dec\\)[ ]+[0-9]+ [ 0-9][0-9][:0-9][0-9][ 0-9] "
-  "Regular expression to match a month abbreviation followed by a number.")
-
 ;; Move to first char of filename on this line.
 ;; Returns position (point) or nil if no filename on this line."
 (defun dired-move-to-filename (&optional raise-error eol)