head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2003.01.28.17.51.11;	author swiergot;	state dead;
branches;
next	1.1;

1.1
date	2003.01.27.19.28.04;	author swiergot;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Renamed dotdot_in_root_dir patch to dotdot_in_rootdir.
- Improved dotdot_in_rootdir patch. Now it is possible to set a proper
  configuration option to tell mc whether it should show .. in /.
@
text
@diff -ru mc-4.6.0-pre3.orig/src/dir.c mc-4.6.0-pre3/src/dir.c
--- mc-4.6.0-pre3.orig/src/dir.c	2003-01-21 03:25:50.000000000 +0100
+++ mc-4.6.0-pre3/src/dir.c	2003-01-27 20:11:56.000000000 +0100
@@@@ -503,9 +503,7 @@@@
     }
 
     if (next_free) {
-	/* Add ".." except the root directory */
-	if (strcmp (vfs_canon ("."), "/") != 0)
-	    add_dotdot_to_list (list, next_free++);
+        add_dotdot_to_list (list, next_free++);
 	do_sort (list, sort, next_free - 1, reverse, case_sensitive);
     } else {
 	tree_store_end_check ();
@@@@ -655,9 +653,7 @@@@
     tree_store_end_check ();
     g_hash_table_destroy (marked_files);
     if (next_free) {
-	/* Add ".." except the root directory */
-	if (strcmp (vfs_canon ("."), "/") != 0)
-	    add_dotdot_to_list (list, next_free++);
+        add_dotdot_to_list (list, next_free++);
 	do_sort (list, sort, next_free - 1, rev, case_sensitive);
     } else
 	next_free = set_zero_dir (list);
@


1.1
log
@- Initial release.
- Version 4.6.0pre3.
- Note on dotdot_in_root_dir patch - since 4.6.0pre3 .. is no longer shown
  in / directory. I don't like this new behavior so the patch restores the
  old one.
@
text
@@


.