Index: dir.c
===================================================================
RCS file: /cvs/gnome/mc/src/dir.c,v
retrieving revision 1.39
diff -r1.39 dir.c
136a137,142
>       if (a->fname[0] == '.' || b->fname[0] == '.') {
>  	if (a->fname[0] == '.' && b->fname[0] == '.')
>           return sort_name (a, b); /* so they appear at bottom */
>         else
>           return sort_name (a, b) * -reverse;
>       } else {
138a145
> 
141c148
< 	    return r * reverse;
---
>           return r * reverse;
143c150,151
< 	    return sort_name (a, b);
---
>           return sort_name (a, b);
>       }
Index: main.c
===================================================================
RCS file: /cvs/gnome/mc/src/main.c,v
retrieving revision 1.234
diff -r1.234 main.c
653a654,656
> /* To align file extensions */
> int align_file_extensions = 1;
> 
Index: main.h
===================================================================
RCS file: /cvs/gnome/mc/src/main.h,v
retrieving revision 1.35
diff -r1.35 main.h
84a85
> extern int align_file_extensions;
Index: screen.c
===================================================================
RCS file: /cvs/gnome/mc/src/screen.c,v
retrieving revision 1.129
diff -r1.129 screen.c
143a144,188
> #if 1
> /* start modification */
> #ifdef ALIGN_EXT_2
>   char *ext;
>   int flen, elen;
>   static char buffer [1000];	/* at most fname len (duh!) */
>   
>   flen = strlen(fe->fname);
>   ext = extension(fe->fname);
>   elen = strlen(ext);
>   
>   if (fe->fname[0] == '.' || elen == 0) return fe->fname;
>   memcpy(buffer, fe->fname, flen - elen - 1);
>   buffer[flen - elen - 1] = 0;
>   
>   return buffer;
>   
> #else
>   if (align_file_extensions == 0) {
>     return fe->fname;
>   } else {
>     
>     char *ext;
>     int flen, dlen, elen;
>     static char buffer [100];	/* at most len */
>   
>     flen = strlen(fe->fname);
>     dlen = len - (flen - 1);
> 
>     if (fe->fname[0] == '.' || dlen <= 0) return fe->fname;
>     ext = extension(fe->fname);
>     elen = strlen(ext);
>     if (elen == 0) return fe->fname;
> 
>     memset(buffer, ' ', len);
>     memcpy(buffer, fe->fname, flen - elen - 1);
>     memcpy(buffer + (len - elen), ext, elen);
>     buffer[len] = 0;
>   
>   /* end */
>     return buffer;
>   }
> #endif
> #else
> =======
162a208,209
> >>>>>>> 1.124
> #endif
Index: setup.c
===================================================================
RCS file: /cvs/gnome/mc/src/setup.c,v
retrieving revision 1.65
diff -r1.65 setup.c
148a149
>     { "align_file_extensions", &align_file_extensions },