Merge branch '8099' of https://github.com/rwldrn/jquery. Fixes #8099.

Conflicts:
	test/data/testsuite.css

2 files changed, 28 insertions, 1 deletions

diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index a9dd97ba4..99851eaa5 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -111,4 +111,9 @@ div#show-tests * { display: none; }
 #nothiddendivchild.prct { font-size: 150%; }
 
 /* For testing type on vml in IE #7071 */
-v\:oval { behavior:url(#default#VML); display:inline-block; }
\ No newline at end of file
+v\:oval { behavior:url(#default#VML); display:inline-block; }
+
+/* 8099 changes to default styles are read correctly */
+tt { display: none; }
+sup { display: none; }
+dfn { display: none; }
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 4faf61743..8b7cf4679 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -162,6 +162,28 @@ test("Persist correct display value", function() {
 	});
 });
 
+test("show() resolves correct default display #8099", function() {
+	expect(7);
+	var tt8099 = jQuery("<tt/>").appendTo("body"), 
+			dfn8099 = jQuery("<dfn/>", { html: "foo"}).appendTo("body");
+
+	equals( tt8099.css("display"), "none", "default display override for all tt" );
+	equals( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	equals( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
+
+	equals( tt8099.hide().css("display"), "none", "default display override for all tt" );
+	equals( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	equals( dfn8099.css("display"), "none", "default display override for all dfn" );
+	equals( dfn8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	tt8099.remove();
+	dfn8099.remove();
+
+});
+
+
 test("animate(Hash, Object, Function)", function() {
 	expect(1);
 	stop();