Merge branch '418_post_fixies'

* 418_post_fixies:
  Update mc.man for describe filenames highlighting.
  Remove description related to filenames highlight from command-line help
  Ticket #418. Post-fixies

contrib/dist/redhat/mc.spec.in

@@ -141,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/mc/Syntax
 %config %{_sysconfdir}/mc/mc.charsets
 %config %{_sysconfdir}/mc/mc.lib
+%config(noreplace) %{_sysconfdir}/mc/filehighlight.ini
 %config(noreplace) %{_sysconfdir}/mc/*edit*
 %config(noreplace) %{_sysconfdir}/mc/mc.ext
 %config(noreplace) %{_sysconfdir}/mc/mc.menu
@@ -153,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Fri Sep 04 2009 Slava Zanko <slavazanko@gmail.com>
+- Add new file %%{_sysconfdir}/mc/filehighlight.ini
+
 * Sat Aug 01 2009 Yury V. Zaytsev <yury@shurup.com>
 - Fixed EL4 (and supposedly EL3) builds
 - Fixed some of rpmlint warnings

doc/man/mc.1.in

@@ -1806,9 +1806,13 @@ display fields
 which apply to the user running Midnight Commander are highlighted with
 the color defined by the
 .I selected
-keyword.  If the file type highlighting is enabled, files are colored
+keyword.  If the file type highlighting is enabled, file names are colored
-according to their file type (e.g. directory, core file, executable,
+according to rules described in /etc/mc/filehighlight.ini file. See
-and so on).
+.\"LINK2"
+Filenames Highlight
+.\"Filenames Highlight"
+for more info.
+
 .PP
 If the
 .I Show Mini\-Status
@@ -3056,9 +3060,8 @@ The colors are optional, and the keywords are: normal, selected, marked,
 markselect, errors, input, reverse, gauge.  Menu colors are: menu,
 menusel, menuhot, menuhotsel.  Dialog colors are: dnormal, dfocus,
 dhotnormal, dhotfocus.  Help colors are: helpnormal, helpitalic,
-helpbold, helplink, helpslink.  Viewer color is: viewunderline.  Special
+helpbold, helplink, helpslink.  Viewer color is: viewunderline. Editor 
-highlighting colors are: executable, directory, link, stalelink, device,
+colors are: editnormal, editbold, editmarked.
-special, core.  Editor colors are: editnormal, editbold, editmarked.
 .PP
 .I input
 determines the color of input lines used in query dialogs.
@@ -3095,27 +3098,6 @@ is used for not selected hyperlinks and
 .I helpslink
 is used for selected hyperlink.
 .PP
-Special highlight colors determine how files are displayed when file
-highlighting is enabled (see the section on
-.\"LINK2"
-Layout\&).
-.\"Layout"
-.I directory
-is used for directories or symbolic links to directories;
-.I executable
-for executable files;
-.I link
-is used for symbolic links which are neither stale nor linked
-to a directory;
-.I stalelink
-is used for stale symbolic links;
-.I device
-\- character and block devices;
-.I special
-is used for special files, such as pipes and sockets;
-.I core
-is for core files.
-.PP
 The possible colors are: black, gray, red, brightred, green,
 brightgreen, brown, yellow, blue, brightblue, magenta, brightmagenta,
 cyan, brightcyan, lightgray and white. And there is a special keyword
@@ -3126,6 +3108,43 @@ used for background color. Example:
 [Colors]
 base_color=normal=white,default:marked=magenta,default
 .fi
+
+.\"NODE "Filenames Highlight"
+.SH "Filenames Highlight"
+Rules of filenames highlight placed in /etc/mc/filehighlight.ini file.
+.PP
+Main section [filehighlight] contain key names as highlight groups and values as color pairs.
+Color pairs described as 'foreground;background'. 'background' may be omited.
+Other sections describe filegroup of highlight. Keys in these groups:
+.TP
+.I type
+file type. if present, all other option ignored
+.TP
+.I regexp
+regular expression. If present, 'extensions' option ignored
+.TP
+.I extensions
+list of extensions of files. Separated by ';' sign.
+.PP
+'type' key may have values:
+.nf
+\- FILE (all files)
+  \- FILE_EXE
+\- DIR (all directoryes)
+  \- LINK_DIR
+\- LINK (all links except stale link)
+  \- HARDLINK
+  \- SYMLINK
+\- STALE_LINK
+\- DEVICE (all device files)
+  \- DEVICE_BLOCK
+  \- DEVICE_CHAR
+\- SPECIAL (all special files)
+  \- SPECIAL_SOCKET
+  \- SPECIAL_FIFO
+  \- SPECIAL_DOOR
+.fi
+
 .\"NODE "Special Settings"
 .SH "Special Settings"
 Most of the settings of the Midnight Commander can be changed from the

src/args.c

@@ -298,7 +298,6 @@ mc_args_new_color_group(void)
 	    "                 editlinestate\n"),
 	/* TRANSLATORS: don't translate keywords and names of colors */
 	_(  "   Help:         helpnormal, helpitalic, helpbold, helplink, helpslink\n"
-	    "   File types:   directory, executable, link, stalelink, device, special, core\n"
 	    "\n" "Colors:\n"
 	    "   black, gray, red, brightred, green, brightgreen, brown,\n"
 	    "   yellow, blue, brightblue, magenta, brightmagenta, cyan,\n"