* setup.c: Remove dead code surrounded by

SAVE_CHANGES_OUTSIDE_OPTIONS_MENU.
* tree.c: Make tree_navigation_flag static.

src/ChangeLog

@@ -1,5 +1,9 @@
 2002-10-22  Pavel Roskin  <proski@gnu.org>
 
+	* setup.c: Remove dead code surrounded by
+	SAVE_CHANGES_OUTSIDE_OPTIONS_MENU.
+	* tree.c: Make tree_navigation_flag static.
+
 	* help.h: Remove unused characters.
 	* help.c (show): Remove handling of unused characters.
 

src/setup.c

@@ -132,13 +132,6 @@ static const struct {
     { 0, 0 }
 };
 
-
-#undef SAVE_CHANGES_OUTSIDE_OPTIONS_MENU
-
-#ifdef SAVE_CHANGES_OUTSIDE_OPTIONS_MENU
-extern int preserve_uidgid;
-#endif
-
 static const struct {
     char *opt_name;
     int  *opt_addr;
@@ -189,13 +182,6 @@ static const struct {
     { "xtree_mode", &xtree_mode },
     { "num_history_items_recorded", &num_history_items_recorded },
     { "file_op_compute_totals", &file_op_compute_totals },
-#ifdef SAVE_CHANGES_OUTSIDE_OPTIONS_MENU
-    { "dive_into_subdirs", &dive_into_subdirs },
-    { "preserve_uidgid", &preserve_uidgid },
-    /* What about the other two options in the copy dialog
-       (follow links, stable symlinks) -Norbert */
-    { "tree_navigation_flag", &tree_navigation_flag },
-#endif /* SAVE_CHANGES_OUTSIDE_OPTIONS_MENU */
 #ifdef USE_VFS
     { "vfs_timeout", &vfs_timeout },
 #ifdef USE_NETCODE

src/tree.c

@@ -55,7 +55,7 @@ extern int command_prompt;
 #define TREE_NORMALC NORMALC
 
 /* Specifies the display mode: 1d or 2d */
-int tree_navigation_flag;
+static int tree_navigation_flag;
 
 /* Forwards */
 static void save_tree (WTree *tree);

src/tree.h

@@ -24,7 +24,6 @@ void tree_chdir (WTree *tree, char *dir);
 
 void sync_tree (char *pathname);
 
-extern int tree_navigation_flag;
 extern int xtree_mode;
 
 WTree *tree_new (int is_panel, int y, int x, int lines, int cols);