Merge branch '4.0.x' into 9198_compile_catalog

Author: tk0miya

CHANGES

@@ -20,6 +20,7 @@ Bugs fixed
   from a property of the class
 * #9188: autosummary: warning is emitted if list value is set to
   autosummary_generate
+* #8380: html search: tags for search result are broken
 * #9198: i18n: Babel emits errors when running compile_catalog
 
 Testing

sphinx/themes/basic/static/searchtools.js

@@ -509,7 +509,7 @@ var Search = {
     var excerpt = ((start > 0) ? '...' : '') +
       $.trim(text.substr(start, 240)) +
       ((start + 240 - text.length) ? '...' : '');
-    var rv = $('<p class="context"></div>').text(excerpt);
+    var rv = $('<p class="context"></p>').text(excerpt);
     $.each(hlwords, function() {
       rv = rv.highlightText(this, 'highlighted');
     });