From: Kevin McCarthy <kevin@8t8.us>
Date: Sat, 19 Jan 2019 05:01:09 +0000 (-0800)
Subject: Merge branch 'stable'
X-Git-Tag: mutt-1-12-rel~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3119b5a15db3534533eef4130d804617abcc5baf;p=mutt

Merge branch 'stable'
---

3119b5a15db3534533eef4130d804617abcc5baf
diff --cc doc/muttrc.man.head
index a4e4e688,e1dc2b10..5d818f72
--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@@ -221,8 -221,9 +221,9 @@@ This command binds the given \fIsequenc
  specify multiple maps, put only a comma between the maps.
  .PP
  .nf
 -\fBcolor\fP \fIobject\fP \fIforeground\fP \fIbackground\fP [ \fIregexp\fP ]
 -\fBcolor\fP index \fIforeground\fP \fIbackground\fP [ \fIpattern\fP ]
 -\fBcolor\fP compose \fIcomposeobject\fP \fIforeground\fP \fIbackground\fP
 +\fBcolor\fP \fIobject\fP [ \fIattribute\fP ... ] \fIforeground\fP \fIbackground\fP [ \fIregexp\fP ]
 +\fBcolor\fP index [ \fIattribute\fP ... ] \fIforeground\fP \fIbackground\fP [ \fIpattern\fP ]
++\fBcolor\fP compose \fIcomposeobject\fP [ \fIattribute\fP ... ] \fIforeground\fP \fIbackground\fP
  \fBuncolor\fP index \fIpattern\fP [ \fIpattern\fP ... ]
  .fi
  .IP