Merge branch 'mc-4.6'

* mc-4.6:
  lib/mc.ext.in: change filemask for recognize 7z-files

ChangeLog

@@ -1,3 +1,10 @@
+2009-01-14 Slava Zanko <slavazanko@gmail.com>
+
+	* lib/mc.ext.in: change filemask for recognize 7z-files
+	* vfs/extfs/u7z: 
+	  - change only LC_DATE global variable for correct work with arhive;
+	  - add sorting by filename in output of list files
+
 2009-01-12 Patrick Winnertz <winnie@debian.org>
 
 	* AUTHORS: Added Enrico Weigelt, Slava Zanko and 

lib/mc.ext.in

@@ -207,7 +207,7 @@ regex/\.iso$
 	View=%view{ascii} isoinfo -l -i %f
 
 # 7zip archives (they are not man pages)
-shell/.7z
+regex/\.(7z|7Z)$
 	Open=%cd %p#u7z
 	View=%view{ascii} 7za l %f 2>/dev/null
 

vfs/extfs/u7z

@@ -47,8 +47,8 @@ mcu7zip_rmdir ()
 }
 
 # override any locale for dates
-LC_ALL=C
-export LC_ALL
+LC_DATE=C
+export LC_DATE
 
 umask 077
 
@@ -56,7 +56,7 @@ cmd="$1"
 shift
 
 case "$cmd" in
-  list)    mcu7zip_list    "$@" ;;
+  list)    mcu7zip_list    "$@" | sort -k 8 ;;
   copyout) mcu7zip_copyout "$@" ;;
   copyin)  mcu7zip_copyin  "$@" ;;
   mkdir)   mcu7zip_mkdir   "$@" ;;