From 43e6f1aa963cb85a1d65ea40a183598a05e1142b Mon Sep 17 00:00:00 2001
From: jfbu <jfbu@free.fr>
Date: Mon, 11 Dec 2017 23:09:19 +0100
Subject: [PATCH] Fix VerbatimHighlightColor key declared non-sphinx-prefixed
 colour name

---
 doc/latex.rst               | 10 +++++-----
 sphinx/texinputs/sphinx.sty |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/latex.rst b/doc/latex.rst
index 5c140d295..58833a829 100644
--- a/doc/latex.rst
+++ b/doc/latex.rst
@@ -261,6 +261,11 @@ The available styling options
 
     .. versionadded:: 1.6.6
 
+.. note::
+
+   Starting with this colour key, and for all others coming next, the actual
+   names declared to "color" or "xcolor" are prefixed with "sphinx".
+
 ``verbatimsep``
     default ``\fboxsep``. The separation between code lines and the frame.
 
@@ -282,11 +287,6 @@ The available styling options
     default ``{rgb}{0,0,0}`` (black). The colour for the two horizontal rules
     used by Sphinx in LaTeX for styling a :dudir:`note` type admonition.
 
-.. note::
-
-   The actual colour names declared to "color" or "xcolor" are prefixed with
-   "sphinx".
-
 ``noteborder``, ``hintborder``, ``importantborder``, ``tipborder``
     default ``0.5pt``. The width of the two horizontal rules.
 
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index 8db09d4a2..49da59363 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -311,8 +311,6 @@
 \sphinxDeclareColorOption{OuterLinkColor}{{rgb}{0.216,0.439,0.388}}
 \sphinxDeclareColorOption{VerbatimColor}{{rgb}{1,1,1}}
 \sphinxDeclareColorOption{VerbatimBorderColor}{{rgb}{0,0,0}}
-% also no prefix for this one, for consistency (sigh). Color as in minted!
-\sphinxDeclareColorOption{VerbatimHighlightColor}{{rgb}{0.878,1,1}}
 % now the colours defined with "sphinx" prefix in their names
 \newcommand*{\sphinxDeclareSphinxColorOption}[2]{%
    % set the initial default
@@ -320,6 +318,8 @@
    % set the key handler. The "value" ##1 must be acceptable by \definecolor.
    \define@key{sphinx}{#1}{\definecolor{sphinx#1}##1}%
 }%
+% Default color chosen to be as in minted.sty LaTeX package!
+\sphinxDeclareSphinxColorOption{VerbatimHighlightColor}{{rgb}{0.878,1,1}}
 % admonition boxes, "light" style
 \sphinxDeclareSphinxColorOption{noteBorderColor}{{rgb}{0,0,0}}
 \sphinxDeclareSphinxColorOption{hintBorderColor}{{rgb}{0,0,0}}
@@ -858,7 +858,7 @@
   \ifin@
      \edef\sphinx@restorefboxsep{\fboxsep\the\fboxsep\relax}%
      \fboxsep\z@
-     \colorbox{VerbatimHighlightColor}%
+     \colorbox{sphinxVerbatimHighlightColor}%
               {\sphinx@restorefboxsep\sphinx@FancyVerbFormatLine{#1}}%
   \else
      \sphinx@FancyVerbFormatLine{#1}%