From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Davison Subject: Re: Bug: C-c ' eats last newline of a figure [6.35trans (release_6.35g.72.g2e12)] Date: Mon, 19 Apr 2010 02:34:44 -0400 Message-ID: <87zl10x857.fsf@stats.ox.ac.uk> References: <87fx2sryjf.fsf@gollum.intra.norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O3kZJ-0002fE-VD for emacs-orgmode@gnu.org; Mon, 19 Apr 2010 02:34:53 -0400 Received: from [140.186.70.92] (port=33550 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O3kZH-0002f6-IX for emacs-orgmode@gnu.org; Mon, 19 Apr 2010 02:34:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O3kZF-0005Se-4U for emacs-orgmode@gnu.org; Mon, 19 Apr 2010 02:34:51 -0400 Received: from markov.stats.ox.ac.uk ([163.1.210.1]:34919) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O3kZE-0005SR-T7 for emacs-orgmode@gnu.org; Mon, 19 Apr 2010 02:34:49 -0400 In-Reply-To: <87fx2sryjf.fsf@gollum.intra.norang.ca> (Bernt Hansen's message of "Sun, 18 Apr 2010 22:01:08 -0400") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Bernt Hansen Cc: emacs-orgmode@gnu.org, Carsten Dominik I've had a quick look at this. A minimal example is #+begin_src ditaa +-- #+end_src The problem seems to be that C-c ' concludes that we're in a table.el table. One solution that came to mind is to move the test for table.el context until after all the other block regexps have been tried. Patch below. Dan commit 1dd6dd3bd79f06dfe2f27958b457c5b4766b3368 Author: Dan Davison Date: Mon Apr 19 02:29:33 2010 -0400 Don't jump to conclusion that we are at table.el table Test various block regexps before testing for table.el context Modified lisp/org-src.el diff --git a/lisp/org-src.el b/lisp/org-src.el index 54ec4af..3319a9e 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -459,15 +459,6 @@ the language, a switch telling if the content should be in a single line." (pos (point)) re1 re2 single beg end lang lfmt match-re1 ind entry) (catch 'exit - (when (org-at-table.el-p) - (re-search-backward "^[\t]*[^ \t|\\+]" nil t) - (setq beg (1+ (point-at-eol))) - (goto-char beg) - (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) - (progn (goto-char (point-max)) (newline))) - (setq end (point-at-bol)) - (setq ind (org-edit-src-get-indentation beg)) - (throw 'exit (list beg end 'table.el nil nil ind))) (while (setq entry (pop re-list)) (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry) single (nth 3 entry)) @@ -498,7 +489,16 @@ the language, a switch telling if the content should be in a single line." (throw 'exit (list (match-end 0) end (org-edit-src-get-lang lang) - single lfmt ind)))))))))))) + single lfmt ind))))))))) + (when (org-at-table.el-p) + (re-search-backward "^[\t]*[^ \t|\\+]" nil t) + (setq beg (1+ (point-at-eol))) + (goto-char beg) + (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) + (progn (goto-char (point-max)) (newline))) + (setq end (point-at-bol)) + (setq ind (org-edit-src-get-indentation beg)) + (throw 'exit (list beg end 'table.el nil nil ind)))))) (defun org-edit-src-get-lang (lang) "Extract the src language." Bernt Hansen writes: > With the following file if you use C-c ' to edit the ditta graphic in > artist mode and then just exit artist mode with another C-c ' > the #+end_src line moves up one line which breaks the block. > > * Ditta Test > #+begin_src ditaa :file x.png :cmdline > +--------------+ +-----------------------------+ > | | | | > | +<------------------------------------------------>+ | > | cBLU | | cF00 | > | +<--------+ +-----------------+ | | > | | | | | | | > +--------------+ | | | +--------------+--------------+ > | | | | > +------+ cRED | | > | | | > | | | > | | +-------------+ > +-----+----+------+ | > +--------------------+ | | v > | | | | +------------+-----------+ > | | | | | | > | cGRE +<-----=--------+ | | | > | | | | | > | | +--------->+ | > +--------------------+ | cYEL | > | | > +------------------------+ > #+end_src > > #+results: > [[file:x.png]] > > After the key sequence C-c ' C-c ' in the block the end of the block now > looks like this: > > | | > +------------------------+#+end_src > > This occurs in both the master and compatibility branches. > > Emacs : GNU Emacs 22.2.1 (i486-pc-linux-gnu, GTK+ Version 2.12.11) > of 2008-11-09 on raven, modified by Debian > Package: Org-mode version 6.35trans (release_6.35g.72.g2e12) > > -Bernt > > > _______________________________________________ > Emacs-orgmode mailing list > Please use `Reply All' to send replies to the list. > Emacs-orgmode@gnu.org > http://lists.gnu.org/mailman/listinfo/emacs-orgmode