Backport change from Chong on 2013-12-23

lisp/org.el

@@ -9063,7 +9063,7 @@ if `orgstruct-heading-prefix-regexp' is not empty."
 					      (key-description key))))))
 			      thereis (key-binding key))))
 		  (if (keymapp binding)
-		      (set-temporary-overlay-map binding)
+		      (set-transient-map binding)
 		    (let ((func (or binding
 				    (unless disable
 				      'orgstruct-error))))