This patch prevents the shortcut dialog from silently over-writing existing bindings...

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index ed12ea2934f8ffe806acb715b0900c6873705890..cf85ec564880e4ee7a45761877088ec115d4e162 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -471,7 +471,7 @@ char const * simplefeatures[] = {
        "endnotes",
        "ifthen",
        "amsthm",
-       "listings",
+       // listings is handled in BufferParams.cpp
        "bm",
        "pdfpages",
        "relsize",
@@ -599,7 +599,10 @@ string const LaTeXFeatures::getPackages() const
                packages << "\\usepackage{esint}\n";
 
        // natbib.sty
-       if (mustProvide("natbib")) {
+       // Some classes load natbib themselves, but still allow (or even require)
+       // plain numeric citations (ReVTeX is such a case, see bug 5182).
+       // This special case is indicated by the "natbib-internal" key.
+       if (mustProvide("natbib") && !tclass.provides("natbib-internal")) {
                packages << "\\usepackage[";
                if (params_.citeEngine() == ENGINE_NATBIB_NUMERICAL)
                        packages << "numbers";