emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bastien <bzg@altern.org>
To: Leo <sdl.web@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: org-capture does not fully clean up after C-c C-k
Date: Tue, 12 Jul 2011 01:00:01 +0200	[thread overview]
Message-ID: <87hb6sh18u.fsf@gnu.org> (raw)
In-Reply-To: <m1sjqdb17j.fsf@gmail.com> (Leo's message of "Mon, 11 Jul 2011 17:45:04 +0800")

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

Hi Leo,

Leo <sdl.web@gmail.com> writes:

> On 2011-06-16 15:51 +0800, Carsten Dominik wrote:
>> Hi Leo,
>>
>> I am unable to reproduce this.  I do get an empty line the first time,
>> but when the empty line is already there, then there is no problem.
>>
>> Do you find the insertion of this one empty line a problem?
>>
>> - Carsten
>
> Sorry for the long delay. I can reproduce this in Emacs -q with
>
>   (setq org-blank-before-new-entry '((heading)))

Please let me know if the attached patch fixes this issue.

Thanks,


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-capture.el-Fix-bug-about-insert-blank-line-when-.patch --]
[-- Type: text/x-patch, Size: 2215 bytes --]

From 38334f29f4c949cad76c199433f60250a824878d Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Tue, 12 Jul 2011 00:57:57 +0200
Subject: [PATCH] org-capture.el: Fix bug about insert blank line when
 aborting.

* org-capture.el (org-capture-finalize): bugfix about
inserted blank line when killing the capture buffer and
`org-blank-before-new-entry' tells to not insert anything
before a heading.

Thanks to Leo for reporting this.
---
 lisp/org-capture.el |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d547f3d..dd74ecc 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -551,6 +551,9 @@ captured item after finalizing."
 	      (m2 (org-capture-get :end-marker 'local)))
 	  (if (and m1 m2 (= m1 beg) (= m2 end))
 	      (progn
+		(setq m2 (if (cdr (assoc 'heading org-blank-before-new-entry))
+			     m2 (1+ m2))
+		      m2 (if (< (point-max) m2) (point-max) m2))
 		(setq abort-note 'clean)
 		(kill-region m1 m2))
 	    (setq abort-note 'dirty)))
@@ -576,16 +579,14 @@ captured item after finalizing."
 		   (org-at-table-p))
 	  (if (org-table-get-stored-formulas)
 	      (org-table-recalculate 'all) ;; FIXME: Should we iterate???
-	    (org-table-align)))
-	)
+	    (org-table-align))))
       ;; Store this place as the last one where we stored something
       ;; Do the marking in the base buffer, so that it makes sense after
       ;; the indirect buffer has been killed.
       (org-capture-bookmark-last-stored-position)
 
       ;; Run the hook
-      (run-hooks 'org-capture-before-finalize-hook)
-      )
+      (run-hooks 'org-capture-before-finalize-hook))
 
     ;; Kill the indirect buffer
     (save-buffer)
@@ -665,7 +666,8 @@ already gone.  Any prefix argument will be passed to the refile command."
   (interactive)
   ;; FIXME: This does not do the right thing, we need to remove the new stuff
   ;; By hand it is easy: undo, then kill the buffer
-  (let ((org-note-abort t) (org-capture-before-finalize-hook nil))
+  (let ((org-note-abort t) 
+	(org-capture-before-finalize-hook nil))
     (org-capture-finalize)))
 
 (defun org-capture-goto-last-stored ()
-- 
1.7.5.2


[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


-- 
 Bastien

  reply	other threads:[~2011-07-11 22:59 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-04 12:30 org-capture does not fully clean up after C-c C-k Leo
2011-06-16  7:51 ` Carsten Dominik
2011-06-16 18:44   ` Jason Dunsmore
2011-06-21  7:57     ` Carsten Dominik
2011-07-22 16:15       ` Jason Dunsmore
2011-06-18  1:06   ` Leo
2011-07-11  9:45   ` Leo
2011-07-11 23:00     ` Bastien [this message]
2011-07-12  4:26       ` Leo
2011-07-12  7:19         ` Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87hb6sh18u.fsf@gnu.org \
    --to=bzg@altern.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=sdl.web@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).