From 8755da29c035b8bd68db9ca89bfaf0b7ec98ef66 Mon Sep 17 00:00:00 2001 From: "Andrew V. Samoilov" Date: Wed, 27 Feb 2002 08:33:09 +0000 Subject: [PATCH] * doc/mc.1.in (Macro Substitution): Document "%var{ENV-default}". (FILES): Document changes in mc behavior. ~/.mc/ini now override mc.lib settings. --- ChangeLog | 7 +++++++ doc/mc.1.in | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e2973baf..7411a75f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-02-27 Andrew V. Samoilov + + * doc/mc.1.in (Macro Substitution): Document "%var{ENV-default}". + (FILES): Document changes in mc behavior. ~/.mc/ini now override + mc.lib settings. + 2002-02-26 Pavel Roskin * lib/mc.ext.in: Run "file" before "nm" to avoid an error @@ -2132,3 +2138,4 @@ Thu Nov 26 12:20:06 1998 Pavel Roskin * configure.in: Use MC_HPUX_PROG_CC_STDC * ChangeLog: There was no ChangeLog here, so I added one. +>>>>>>> 1.417 diff --git a/doc/mc.1.in b/doc/mc.1.in index 22ab0a1ce..a5c20ac87 100644 --- a/doc/mc.1.in +++ b/doc/mc.1.in @@ -2062,6 +2062,16 @@ the braces is used as a prompt. The macro is substituted by the text typed by the user. The user can press ESC or F10 to cancel. This macro doesn't work on the command line yet. .PP +.I "%var{ENV:default}" +.IP +If environment variable +.I ENV +is unset, the +.I default +is substituted. Otherwise, the value of +.I ENV +is substituted. +.PP .SH " The subshell support" The subshell support is a compile time option, that works with the shells: bash, tcsh and zsh. @@ -3132,8 +3142,7 @@ the user doesn't have his own ~/.mc/ini file. @prefix@/lib/mc/mc.lib .IP Global settings for the Midnight Commander. Settings in this file -affect all users, whether they have ~/.mc/ini or not, as long as -~/.mc/ini doesn't override them. Currently, only +affect all users, whether they have ~/.mc/ini or not. Currently, only .\"LINK2" terminal settings .\"Terminal databases"