Merge branch '3243_usmenu_view_man'

* 3243_usmenu_view_man:
  Fix for viewving man pages in colour mode.
  Ticket #3243: "User menu -> View manual page" doesn't do coloring

configure.ac

@@ -510,6 +510,9 @@ contrib/dist/pkginfo
 contrib/dist/prototype
 
 misc/Makefile
+misc/mc.menu
+misc/mcedit.menu
+misc/mc.menu.sr
 misc/skins/Makefile
 misc/ext.d/Makefile
 misc/ext.d/doc.sh

misc/Makefile.am

@@ -12,14 +12,22 @@ if CHARSET
 pkgdata_DATA += mc.charsets
 endif
 
+SCRIPTS_IN = \
+	mc.menu.in \
+	mc.menu.sr.in \
+	mcedit.menu.in
+
+SCRIPTS_OUT = \
+	mc.menu \
+	mc.menu.sr \
+	mcedit.menu
+
 LIBFILES_CONST = \
-	mcedit.menu \
 	filehighlight.ini \
 	mc.keymap \
 	mc.default.keymap \
-	mc.emacs.keymap \
+	mc.emacs.keymap
-	mc.menu \
+
-	mc.menu.sr
 
 LIBFILES_SCRIPT = \
 	edit.indent.rc
@@ -29,6 +37,7 @@ CLEANFILES = $(SCRIPTS_OUT)
 cfgdir = $(sysconfdir)/@PACKAGE@
 cfg_DATA = \
 	$(LIBFILES_CONST) \
+	$(SCRIPTS_OUT) \
 	$(LIBFILES_OUT)
 
 cfg_SCRIPTS = \

misc/mc.menu.in

@@ -21,7 +21,7 @@ shell_patterns=0
 
 =+ f \.1$ | f \.3$ | f \.4$ | f \.5$ | f \.6$ | f \.7$ | f \.8$ | f \.man$ & t r
 1       Display the file with roff -man
-	nroff -man %f | less
+	%view{ascii,nroff} roff @MAN_FLAGS@ @MANDOC@ %f
 
 2       Call the info hypertext browser
         info
@@ -121,7 +121,7 @@ D       Delete tagged files if a copy exists in the other directory.
 
 m       View manual page
 	MAN=%{Enter manual name}
-	%view man -P cat $MAN
+	%view{ascii,nroff} MANROFFOPT='@MAN_FLAGS@' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 = f \.gz$ & t r
 + ! t t

misc/mc.menu.sr.in

@@ -102,7 +102,7 @@ D       Обриши означене датотеке ако постоји к
 
 m       Погледај страницу упутства
 	MAN=%{Унесите назив упутства}
-	%view man -P cat $MAN
+	%view{ascii,nroff} MANROFFOPT='@MAN_FLAGS@' MAN_KEEP_FORMATTING=1 man -P cat $MAN
 
 = f \.gz$ & t r
 + ! t t

misc/mcedit.menu.in

@@ -459,10 +459,7 @@ s       Invoke `shell'
 
 m       view `man'
         MAN=%{Enter name of man:}
-        TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/mcview.$MAN.XXXXXX` || exit 1
+        %view{ascii,nroff} MANROFFOPT='@MAN_FLAGS@' MAN_KEEP_FORMATTING=1 man -P cat $MAN
-        man -Pcat $MAN >$TMPFILE
-        mcview $TMPFILE
-        rm -f $TMPFILE
 
 i       Insert a out of command to cursor.
         CMD=%{ Enter command: }