[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] Re: [BUG] Unmatched #+end-src
From: |
Nicolas Goaziou |
Subject: |
[O] Re: [BUG] Unmatched #+end-src |
Date: |
Thu, 17 Mar 2011 13:09:04 +0100 |
Hello,
"Eric Schulte" <address@hidden> writes:
>> The real problem is: how should Org react when parsing syntactically
>> erroneous buffers? I concede that freezing Emacs isn't nice, but otoh,
>> code can't deal with every possible user error.
>>
>> So, what is the expected behavior here? Consider orphan #+end_ as
>> normal text, throw an error, or both? An answer to this question would
>> be more useful than code, honestly.
>>
>
> This is just opinion and gut reaction, but my first instinct is to say
> that Org just treat an orphan #+end_ as normal text (or technically as
> an Org-mode comment).
>
> The same is true for a floating #+begin_src. Until the block is closed,
> it is just a comment.
As it's the only answer so far, I guess it was more trivial than
I thought.
Here is a patch that should fix the original problem.
Martyn, as you are writing tests, would you mind running it against
them, before I apply it?
Many thanks in advance.
Regards,
>From 805e11e419c58a9f3fdb470987056c5ac970817f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <address@hidden>
Date: Thu, 17 Mar 2011 13:01:06 +0100
Subject: [PATCH] org-list: fix infinite loop on erroneous block and drawer
constructs
* lisp/org-list.el (org-list-struct,org-in-item-p): don't assume end
of blocks or drawers necessarily start somewhere. It it isn't the
case, treat them as normal text.
---
lisp/org-list.el | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lisp/org-list.el b/lisp/org-list.el
index aea8634..8bfd359 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -465,10 +465,10 @@ This checks `org-list-ending-method'."
(looking-at org-list-end-re))
(throw 'exit nil))
;; Skip blocks, drawers, inline-tasks, blank lines
- ((looking-at "^[ \t]*#\\+end_")
- (re-search-backward "^[ \t]*#\\+begin_" nil t))
- ((looking-at "^[ \t]*:END:")
- (re-search-backward org-drawer-regexp nil t)
+ ((and (looking-at "^[ \t]*#\\+end_")
+ (re-search-backward "^[ \t]*#\\+begin_" lim-up t)))
+ ((and (looking-at "^[ \t]*:END:")
+ (re-search-backward org-drawer-regexp lim-up t))
(beginning-of-line))
((and inlinetask-re (looking-at inlinetask-re))
(org-inlinetask-goto-beginning)
@@ -686,10 +686,10 @@ Assume point is at an item."
(memq (assq (car beg-cell) itm-lst) itm-lst))))
;; Skip blocks, drawers, inline tasks, blank lines
;; along the way.
- ((looking-at "^[ \t]*#\\+end_")
- (re-search-backward "^[ \t]*#\\+begin_" nil t))
- ((looking-at "^[ \t]*:END:")
- (re-search-backward drawers-re nil t)
+ ((and (looking-at "^[ \t]*#\\+end_")
+ (re-search-backward "^[ \t]*#\\+begin_" lim-up t)))
+ ((and (looking-at "^[ \t]*:END:")
+ (re-search-backward drawers-re lim-up t))
(beginning-of-line))
((and inlinetask-re (looking-at inlinetask-re))
(org-inlinetask-goto-beginning)
@@ -753,11 +753,11 @@ Assume point is at an item."
(throw 'exit (push (cons 0 (point)) end-lst-2)))
;; Skip blocks, drawers, inline tasks and blank lines
;; along the way
- ((looking-at "^[ \t]*#\\+begin_")
- (re-search-forward "^[ \t]*#\\+end_")
+ ((and (looking-at "^[ \t]*#\\+begin_")
+ (re-search-forward "^[ \t]*#\\+end_" lim-down t))
(forward-line 1))
- ((looking-at drawers-re)
- (re-search-forward "^[ \t]*:END:" nil t)
+ ((and (looking-at drawers-re)
+ (re-search-forward "^[ \t]*:END:" lim-down t))
(forward-line 1))
((and inlinetask-re (looking-at inlinetask-re))
(org-inlinetask-goto-end))
--
1.7.4.1
--
Nicolas Goaziou
Re: [O] [BUG] Unmatched #+end-src, Martyn Jago, 2011/03/12
[O] Re: [BUG] Unmatched #+end-src, Nicolas, 2011/03/23