summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-07 13:26:12 +0100
committerBastien Guerry <bzg@altern.org>2014-01-07 13:26:12 +0100
commitccbe3965b131663bb4944514a209f5b6a3b79d09 (patch)
tree43ea76f0ad715144e3b3d3121cfa1d4bebc77571
parenta0d4c8d85da9415e2b8fdcb129c884ea8cbcb493 (diff)
parent152712a7c87284c99ab4ad7e9d3e961d12943826 (diff)
downloadorg-mode-ccbe3965b131663bb4944514a209f5b6a3b79d09.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org.el b/lisp/org.el
index feab2bc..64b0070 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9147,7 +9147,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))))