[PATCH 1 of 6 STABLE] help: use mercurial as a subject of colorization and pagination
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Sun Apr 30 20:54:03 UTC 2017
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1493584557 -32400
# Mon May 01 05:35:57 2017 +0900
# Branch stable
# Node ID a6865b35a10dab027375ec83189dfda33f614d1b
# Parent fcddcf442e4f4cd15bb9334e009fb60299e0a4e6
help: use mercurial as a subject of colorization and pagination
Now, colorization and pagination are in Mercurial core.
diff --git a/mercurial/help/color.txt b/mercurial/help/color.txt
--- a/mercurial/help/color.txt
+++ b/mercurial/help/color.txt
@@ -119,7 +119,7 @@ effects may be overridden from your conf
Custom colors
=============
-Because there are only eight standard colors, this module allows you
+Because there are only eight standard colors, Mercurial allows you
to define color names for other color slots which might be available
for your terminal type, assuming terminfo mode. For instance::
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -414,16 +414,15 @@ effect and style see :hg:`help color`.
``mode``
String: control the method used to output color. One of ``auto``, ``ansi``,
- ``win32``, ``terminfo`` or ``debug``. In auto mode the color extension will
+ ``win32``, ``terminfo`` or ``debug``. In auto mode, Mercurial will
use ANSI mode by default (or win32 mode on Windows) if it detects a
terminal. Any invalid value will disable color.
``pagermode``
- String: optinal override of ``color.mode`` used with pager (from the pager
- extensions).
+ String: optinal override of ``color.mode`` used with pager.
On some systems, terminfo mode may cause problems when using
- color with the pager extension and less -R. less with the -R option
+ color with ``less -R`` as a pager program. less with the -R option
will only display ECMA-48 color codes, and terminfo mode may sometimes
emit codes that less doesn't understand. You can work around this by
either using ansi mode (or auto mode), or by using less -r (which will
@@ -431,8 +430,7 @@ effect and style see :hg:`help color`.
codes).
On some systems (such as MSYS in Windows), the terminal may support
- a different color mode than the pager (activated via the "pager"
- extension).
+ a different color mode than the pager program.
``commands``
------------
diff --git a/mercurial/help/pager.txt b/mercurial/help/pager.txt
--- a/mercurial/help/pager.txt
+++ b/mercurial/help/pager.txt
@@ -6,7 +6,7 @@ To set the pager that should be used, se
[pager]
pager = less -FRX
-If no pager is set, the pager extensions uses the environment variable
+If no pager is set, Mercurial uses the environment variable
$PAGER. If neither pager.pager, nor $PAGER is set, a default pager
will be used, typically `less` on Unix and `more` on Windows.
More information about the Mercurial-devel
mailing list