Wed Mar 4 14:49:55 1998 <k3190@fh-sw.de>

* doc/mc.1.in, mc.hlp: updated (these files haven't been updated
at the last change to mc.sgml)

* doc/mc.sgml: spelling error corrected

* Makefile.in: renamed all references of mc.1 to mc.1.in

* find.c (locate_egrep): Don't use an absolute path if egrep isn't
found at the usual places. Then execvp will search the directories
passed in the environment PATH variable (a little bit slower but
better than a defunct find content).

* tree.c: removed the include file I mistakenly added with my
last patch.

doc/mc.1.in

@@ -2649,7 +2649,7 @@ marked, markselect, errors, input, reverse menu, menusel, menuhot, menuhotsel,
 gauge;  the dialog colors are: dnormal, dfocus, dhotnormal, dhotfocus;
 Help colors are: helpnormal, helpitalic, helpbold, helplink,
 helpslink; Viewer color is: viewunderline; Special highlighting mode: 
-directory, link, device, special.
+executable, directory, link, device, special.
 .PP
 The dialog boxes use the following colors:
 .I dnormal 
@@ -2684,16 +2684,23 @@ how many percent of files were copied etc. in a graphical way.
 .PP
 For file type highlighting mode 
 .I directory
-specifies the color in witch directories shows; 
+specifies the color in which directories are shown; 
+.I executable
+for executable files;
 .I link 
-is used to
+is used to represent links; 
-represent links; 
 .I device 
 for character and block devices;
 .I special
-is for special files, such as FIFO and IPC sockets (see
+is for special files, such as FIFO and IPC sockets;
-also: <lnk name="special settings" id="Special Settings">, option
+.I core
-.B highlight_mode.
+is for core files (see also the option 
+.B highlight_mode
+at the section on
+.\"LINK2"
+Special Settings).
+.\"Special Settings"
+
 .PP
 The possible colors are: black, gray, red, brightred, green,
 brightgreen, brown, yellow, blue, brightblue, magenta, brightmagenta,
@@ -2851,7 +2858,7 @@ is equal to 2, then all lines are displaying by the color according to
 their type (see 
 .\"LINK2"
 Colors).
-.\"Colors"). 
+.\"Colors"
 Permissions highlighting also works in this mode.
 .PP
 .I use_file_to_guess_type

doc/mc.sgml

@@ -2308,11 +2308,11 @@ is used for selected hyperlink.
 etc. in a graphical way.
 
 For file type highlighting mode <em/directory/ specifies the color in
-witch directories shows; <em/executable/ for executable files;
+which directories are shown; <em/executable/ for executable files;
 <em/link/ is used to represent links; <em/device/ - for character and
 block devices; <em/special/ is for special files, such as FIFO and IPC
-sockets (see also: <lnk name="special settings" id="Special
+sockets; <em/core/ is for core files (see also the option <tt/highlight_mode/
-Settings">, option <tt/highlight_mode/), <em/core/ is for core files.
+at the section on <lnk name="special settings" id="Special Settings">).
 
 The possible colors are: black, gray, red, brightred, green,
 brightgreen, brown, yellow, blue, brightblue, magenta,

src/ChangeLog

@@ -1,5 +1,19 @@
-Tue Mar  3 20:21:53 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+Wed Mar  4 14:49:55 1998    <k3190@fh-sw.de>
 
+	* doc/mc.1.in, mc.hlp: updated (these files haven't been updated
+	at the last change to mc.sgml)
+
+	* doc/mc.sgml: spelling error corrected
+
+	* Makefile.in: renamed all references of mc.1 to mc.1.in
+
+	* find.c (locate_egrep): Don't use an absolute path if egrep isn't
+	found at the usual places. Then execvp will search the directories 
+	passed in the environment PATH variable (a little bit slower but
+	better than a defunct find content).
+
+	* tree.c: removed the include file I mistakenly added with my
+	last patch.
 
 Tue Mar  3 20:00:36 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 

src/Makefile.in

@@ -97,11 +97,11 @@ cross:
 $(srcdir)/mc.hlp: ync.hlp $(datadir)/xnc.hlp $(srcdir)/gindex.pl
 	cat ync.hlp $(datadir)/xnc.hlp | $(srcdir)/gindex.pl > $(srcdir)/mc.hlp
 
-ync.hlp: $(docdir)/mc.1 man2hlp
+ync.hlp: $(docdir)/mc.1.in man2hlp
-	./man2hlp 58 $(docdir)/mc.1 > ync.hlp
+	./man2hlp 58 $(docdir)/mc.1.in > ync.hlp
 
-mc.html: $(docdir)/mc.1 man2hlp
+mc.html: $(docdir)/mc.1.in man2hlp
-	./man2hlp 0 $(docdir)/mc.1 > body.html
+	./man2hlp 0 $(docdir)/mc.1.in > body.html
 	cat index.html body.html > mc.html
 	$(RM) index.html body.html
 

src/find.c

@@ -338,7 +338,7 @@ locate_egrep (void)
 	if (stat (*p, &s) == 0)
 	    return *p;
     }
-    return "/bin/grep";
+    return "egrep";
 }
 
 /* 

src/mc.hlp

@@ -995,11 +995,17 @@ Find File
 The Find File feature first asks for the start directory
 for the search and the filename to be searched for. By
 pressing the Tree button you can select the start
-directory from the 
directory treeDirectory Tree figure. You can start
+directory from the 
directory treeDirectory Tree figure.
-the search by pressing the Ok button.
 
-During the search you can stop from the Stop button and
+The contents field accepts regular expressions similar to
-continue from the Start button.
+egrep(1). That means you have to escape characters with a
+special meaning to egrep with "\", e.g. if you search for
+"strcmp (" you will have to input "strcmp \(" (without the
+double quotes).
+
+You can start the search by pressing the Ok button. During
+the search you can stop from the Stop button and continue
+from the Start button.
 
 You can browse the filelist with the up and down arrow
 keys. The Chdir button will change to the directory of the
@@ -2398,14 +2404,12 @@ is used for selected hyperlink.
 etc. in a graphical way.
 
 For file type highlighting mode directory specifies the
-color in witch directories shows; executable for
+color in which directories are shown; executable for
 executable files; link  is used to represent links; device
 for character and block devices; special is for special
-files, such as FIFO and IPC sockets (see also: <lnk
+files, such as FIFO and IPC sockets; core is for core
-name="special settings" id="Special Settings">, option
+files (see also the option highlight_mode at the section
-highlight_mode);
+on 
Special Settings).Special Settings
-
-core is for core files.
 
 The possible colors are: black, gray, red, brightred,
 green, brightgreen, brown, yellow, blue, brightblue,
@@ -2533,8 +2537,7 @@ Appropriate triplet of reading, writing and execution
 rights highlighted with the yellow ( selected ) color. In
 addition, if the variable is equal to 2, then all lines
 are displaying by the color according to their type (see
-
Colors).Colors").  Permissions highlighting also works in this
+
Colors).Colors Permissions highlighting also works in this mode.
-mode.
 
 use_file_to_guess_type If this variable is on (the
 default) it will spawn the file command to match the file

src/tree.c

@@ -59,7 +59,6 @@
 #include "key.h"	/* For mi_getch() */
 #include "tree.h"
 #include "cmd.h"
-#include "command.h"
 #include "../vfs/vfs.h"
 
 extern int command_prompt;