emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Columnview: Fix the case of #+ content present
@ 2013-09-17 19:13 Benjamin Beckwith
  2013-09-22  6:08 ` Carsten Dominik
  0 siblings, 1 reply; 2+ messages in thread
From: Benjamin Beckwith @ 2013-09-17 19:13 UTC (permalink / raw)
  To: emacs-orgmode

* lisp/org-colview.el (org-dblock-write:columnview): Change the
  capture of pos to after inserting the original content

The problem is with a block that has content preceding the table.
Upon recreating the content, the `pos' gets set to the beginning of
this content instead of the table.  Later calls to
`org-table-recalculate' or `org-table-align' will fail because the
point is not at a table.

This patch moves the capture of `pos' to right before the insertion of
the table.

TINYCHANGE
---
 lisp/org-colview.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index f3b8e42..8790ad4 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1306,10 +1306,10 @@ PARAMS is a property list of parameters:
                            (if (eq 'hline x) x (cons "" x)))
                          tbl))
        (setq tbl (append tbl (list (cons "/" (make-list nfields "<>"))))))
-      (setq pos (point))
       (when content-lines
        (while (string-match "^#" (car content-lines))
          (insert (pop content-lines) "\n")))
+      (setq pos (point))
       (insert (org-listtable-to-string tbl))
       (when (plist-get params :width)
        (insert "\n|" (mapconcat (lambda (x) (format "<%d>" (max 3 x)))
--
1.8.1.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Columnview: Fix the case of #+ content present
  2013-09-17 19:13 [PATCH] Columnview: Fix the case of #+ content present Benjamin Beckwith
@ 2013-09-22  6:08 ` Carsten Dominik
  0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2013-09-22  6:08 UTC (permalink / raw)
  To: Benjamin Beckwith; +Cc: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]

Applied, thank you Benjamin.

- Carsten

On 17.9.2013, at 21:13, Benjamin Beckwith <bnbeckwith@gmail.com> wrote:

> * lisp/org-colview.el (org-dblock-write:columnview): Change the
>  capture of pos to after inserting the original content
> 
> The problem is with a block that has content preceding the table.
> Upon recreating the content, the `pos' gets set to the beginning of
> this content instead of the table.  Later calls to
> `org-table-recalculate' or `org-table-align' will fail because the
> point is not at a table.
> 
> This patch moves the capture of `pos' to right before the insertion of
> the table.
> 
> TINYCHANGE
> ---
> lisp/org-colview.el | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lisp/org-colview.el b/lisp/org-colview.el
> index f3b8e42..8790ad4 100644
> --- a/lisp/org-colview.el
> +++ b/lisp/org-colview.el
> @@ -1306,10 +1306,10 @@ PARAMS is a property list of parameters:
>                            (if (eq 'hline x) x (cons "" x)))
>                          tbl))
>        (setq tbl (append tbl (list (cons "/" (make-list nfields "<>"))))))
> -      (setq pos (point))
>       (when content-lines
>        (while (string-match "^#" (car content-lines))
>          (insert (pop content-lines) "\n")))
> +      (setq pos (point))
>       (insert (org-listtable-to-string tbl))
>       (when (plist-get params :width)
>        (insert "\n|" (mapconcat (lambda (x) (format "<%d>" (max 3 x)))
> --
> 1.8.1.2
> 


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-09-22  6:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-17 19:13 [PATCH] Columnview: Fix the case of #+ content present Benjamin Beckwith
2013-09-22  6:08 ` Carsten Dominik

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).