Merge branch 'maint'

2014-01-22 11:44:59 +01:00 · 2014-01-22 11:44:59 +01:00 · 0b67b7e283
parent 410b6a65f9 77458b782a
commit 0b67b7e283
1 changed files with 6 additions and 0 deletions
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@ -260,6 +260,12 @@ ignored in this case."
 		  next (+ from (* n inc)))))
 	(nreverse seq)))))

+;; `set-transient-map' is only in Emacs >= 24.4
+(defalias 'org-set-transient-map
+  (if (fboundp 'set-transient-map)
+      'set-transient-map
+    'set-temporary-overlay-map))
+
 ;; Region compatibility

 (defvar org-ignore-region nil