summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Schmidt <ch@ristopher.com>2014-10-11 21:40:45 +0200
committerBastien Guerry <bzg@altern.org>2014-10-12 06:57:35 +0200
commit9c3d22f86449d284efd5126254e4c76e43c09f48 (patch)
tree420d3340e05ca60e5deda0fc7d5739b052f0428d
parent88457acff411eca9b32c04b4bc100ef094a23c5c (diff)
downloadorg-mode-9c3d22f86449d284efd5126254e4c76e43c09f48.tar.gz
org.el (orgstruct-make-binding): Do not use loop in interpreted code.release_8.2.9
* lisp/org.el (orgstruct-make-binding): Do not use loop in interpreted code.
-rw-r--r--lisp/org.el21
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/org.el b/lisp/org.el
index c42102c..2b5603c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9099,14 +9099,16 @@ if `orgstruct-heading-prefix-regexp' is not empty."
(if fallback
(let* ((orgstruct-mode)
(binding
- (loop with key = ,key
- for rep in
- '(nil
- ("<\\([^>]*\\)tab>" . "\\1TAB")
- ("<\\([^>]*\\)return>" . "\\1RET")
- ("<\\([^>]*\\)escape>" . "\\1ESC")
- ("<\\([^>]*\\)delete>" . "\\1DEL"))
- do
+ (let ((key ,key))
+ (catch 'exit
+ (dolist
+ (rep
+ '(nil
+ ("<\\([^>]*\\)tab>" . "\\1TAB")
+ ("<\\([^>]*\\)return>" . "\\1RET")
+ ("<\\([^>]*\\)escape>" . "\\1ESC")
+ ("<\\([^>]*\\)delete>" . "\\1DEL"))
+ nil)
(when rep
(setq key (read-kbd-macro
(let ((case-fold-search))
@@ -9114,7 +9116,8 @@ if `orgstruct-heading-prefix-regexp' is not empty."
(car rep)
(cdr rep)
(key-description key))))))
- thereis (key-binding key))))
+ (when (key-binding key)
+ (throw 'exit (key-binding key))))))))
(if (keymapp binding)
(org-set-transient-map binding)
(let ((func (or binding