Merge branch 'stable'

diff --cc doc/muttrc.man.head
index a4e4e688dc0099a5df8ace977426cb197d754976,e1dc2b102679d0d61e09491e7f7c6c3091999c0c..5d818f72beec7108e621374c451dfe7edf1d42a2
--- 1/doc/muttrc.man.head
--- 2/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