[PATCH] org-edit-special too much space if starting with empty block

[PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

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

Some tests:

Case 1:

Start with emacs -Q

I insert

"
#+begin_src javascript
#+end_src
"

with point before "#+end_src", I press " C-c ' " to start editing the source

I enter "foobar" into the source buffer and immediately exit with " C-c ' "

Case 2:

restart with

"
#+begin_src javascript

#+end_src
"

I've included a patch that fixes both issues.

-- 
Le

[-- Attachment #2: org-src.el.3.diff --]
[-- Type: application/octet-stream, Size: 1412 bytes --]

diff --git a/lisp/org-src.el b/lisp/org-src.el
index 75db1d7..064bf19 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -215,11 +215,19 @@ buffer."
     (setq org-edit-src-saved-temp-window-config (current-window-configuration)))
   (let* ((mark (and (org-region-active-p) (mark)))
 	 (case-fold-search t)
-	 (info (org-edit-src-find-region-and-lang))
+	 (info (let* ((first-pass (org-edit-src-find-region-and-lang))
+		      (first-pass-beg (nth 0 first-pass))
+		      (first-pass-end (nth 1 first-pass)))
+		 (if (< first-pass-end first-pass-beg)
+		     (progn
+		       (goto-char first-pass-beg)
+		       (insert "\n")
+		       (org-edit-src-find-region-and-lang))
+		   first-pass)))
 	 (full-info (org-babel-get-src-block-info 'light))
 	 (org-mode-p (derived-mode-p 'org-mode)) ;; derived-mode-p is reflexive
 	 (beg (make-marker))
-	 (end (make-marker))
+	 (end (copy-marker nil t))
 	 (allow-write-back-p (null code))
 	 block-nindent total-nindent ovl lang lang-f single lfmt buffer msg
 	 begline markline markcol line col transmitted-variables)
@@ -692,7 +700,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
       (delete-region beg (max beg (1- end)))
       (unless (string-match "\\`[ \t]*\\'" code)
 	(insert code)
-	(delete-char 1))
+	(unless (= (point) end)
+	  (delete-char 1)))
       (goto-char beg)
       (if single (just-one-space)))
     (if (memq t (mapcar (lambda (overlay)

Re: [PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

Can someone take a look at these test cases and if this patch or some
other fixes is appropriate?

I use org-mode to take lots of notes of source code and this is annoying.

On Mon, Nov 5, 2012 at 10:31 PM, Le Wang <l26wang@gmail.com> wrote:
> Some tests:
>
> Case 1:
>
> Start with emacs -Q
>
> I insert
>
> "
> #+begin_src javascript
> #+end_src
> "
>
> with point before "#+end_src", I press " C-c ' " to start editing the source
>
> I enter "foobar" into the source buffer and immediately exit with " C-c ' "
>
> Case 2:
>
> restart with
>
> "
> #+begin_src javascript
>
> #+end_src
> "
>
> I've included a patch that fixes both issues.
>
> --
> Le



-- 
Le

Re: [PATCH] org-edit-special too much space if starting with empty block

[Nicolas Goaziou]

Hello,

Le Wang <l26wang@gmail.com> writes:

> Some tests:
>
> Case 1:
>
> Start with emacs -Q
>
> I insert
>
> "
> #+begin_src javascript
> #+end_src
> "
>
> with point before "#+end_src", I press " C-c ' " to start editing the source
>
> I enter "foobar" into the source buffer and immediately exit with " C-c ' "
>
> Case 2:
>
> restart with
>
> "
> #+begin_src javascript
>
> #+end_src
> "
>
> I've included a patch that fixes both issues.

Thank you for your patch.

Would you mind adding comments in the function in order to explain the
need for two pass. Also, you may want to reverse the if test in order to
get rid of the progn.

Finally, could you provide the patch as "git format-patch" and add
a changelog entry to it?


Regards,

-- 
Nicolas Goaziou

Re: [PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

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

On Fri, Nov 9, 2012 at 8:23 AM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Thank you for your patch.
>
> Would you mind adding comments in the function in order to explain the
> need for two pass. Also, you may want to reverse the if test in order to
> get rid of the progn.

I've refactored and added comments.

> Finally, could you provide the patch as "git format-patch" and add
> a changelog entry to it?

The patch is now in the requested format.  If the commit message and
inlined comments still aren't enough to explain the changes, please
let me know.

Thanks!


-- 
Le

[-- Attachment #2: org-src.el.patch --]
[-- Type: application/octet-stream, Size: 2054 bytes --]

From ec36f46a1ac57e99e34db29cf71379d91a8d6b9b Mon Sep 17 00:00:00 2001
From: Le Wang <le.wang@agworld.com.au>
Date: Sun, 18 Nov 2012 13:39:51 +0800
Subject: [PATCH] fix org-edit-src-code for empty blocks and block with just
 an empty line

- use marker with insertion type 't to track end and remove hack requiring
  delete from `beg' to `(1- end)'
---
 lisp/org-src.el | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lisp/org-src.el b/lisp/org-src.el
index 75db1d7..4bd85a6 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -215,11 +215,23 @@ buffer."
     (setq org-edit-src-saved-temp-window-config (current-window-configuration)))
   (let* ((mark (and (org-region-active-p) (mark)))
 	 (case-fold-search t)
-	 (info (org-edit-src-find-region-and-lang))
+	 (info
+	  ;; if the src region consistes of no lines, we insert a
+	  ;; blank line.
+	  (let* ((temp (org-edit-src-find-region-and-lang))
+		 (beg (nth 0 temp))
+		 (end (nth 1 temp)))
+	    (if (< end beg)
+		(progn (goto-char beg)
+		       (insert "\n")
+		       (org-edit-src-find-region-and-lang))
+	      temp)))
 	 (full-info (org-babel-get-src-block-info 'light))
 	 (org-mode-p (derived-mode-p 'org-mode)) ;; derived-mode-p is reflexive
 	 (beg (make-marker))
-	 (end (make-marker))
+	 ;; move marker with inserted text for case when src block is
+	 ;; just one empty line, i.e. beg == end
+	 (end (copy-marker nil t))
 	 (allow-write-back-p (null code))
 	 block-nindent total-nindent ovl lang lang-f single lfmt buffer msg
 	 begline markline markcol line col transmitted-variables)
@@ -689,10 +701,9 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
       (kill-buffer buffer))
     (goto-char beg)
     (when allow-write-back-p
-      (delete-region beg (max beg (1- end)))
+      (delete-region beg (max beg end))
       (unless (string-match "\\`[ \t]*\\'" code)
-	(insert code)
-	(delete-char 1))
+	(insert code))
       (goto-char beg)
       (if single (just-one-space)))
     (if (memq t (mapcar (lambda (overlay)
-- 
1.7.11.4

Re: [PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

Has anyone had a chance to check this out?  Others have run into this problem.

On Sun, Nov 18, 2012 at 1:49 PM, Le Wang <l26wang@gmail.com> wrote:
> On Fri, Nov 9, 2012 at 8:23 AM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
>> Thank you for your patch.
>>
>> Would you mind adding comments in the function in order to explain the
>> need for two pass. Also, you may want to reverse the if test in order to
>> get rid of the progn.
>
> I've refactored and added comments.
>
>> Finally, could you provide the patch as "git format-patch" and add
>> a changelog entry to it?
>
> The patch is now in the requested format.  If the commit message and
> inlined comments still aren't enough to explain the changes, please
> let me know.
>
> Thanks!
>
>
> --
> Le



-- 
Le

Re: [PATCH] org-edit-special too much space if starting with empty block

[Nicolas Goaziou]

Le Wang <l26wang@gmail.com> writes:

> Has anyone had a chance to check this out?  Others have run into this
> problem.

I've pushed your changes. Thank you.

Btw, have you signed the FSF papers for larger patches?


Regards,

-- 
Nicolas Goaziou

Re: [PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

On Fri, Nov 30, 2012 at 9:23 PM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> I've pushed your changes. Thank you.
>
> Btw, have you signed the FSF papers for larger patches?


Thanks Nicolas.  I have signed assignment papers for Emacs.


-- 
Le

Re: [PATCH] org-edit-special too much space if starting with empty block

[Nicolas Goaziou]

Le Wang <l26wang@gmail.com> writes:

> Thanks Nicolas.  I have signed assignment papers for Emacs.

Great. I have added you to the list of contributors, in Worg.


Regards,

-- 
Nicolas Goaziou

Re: [PATCH] org-edit-special too much space if starting with empty block

[Bastien]

Nicolas Goaziou <n.goaziou@gmail.com> writes:

> Le Wang <l26wang@gmail.com> writes:
>
>> Thanks Nicolas.  I have signed assignment papers for Emacs.
>
> Great. I have added you to the list of contributors, in Worg.

Note: I did not received confirmation from the FSF yet.  
Le, did you receive it?   To be on the safe side, I try
to add people on this list only with the FSF copyright
clerk confirm the author status.  Just double-checking.

-- 
 Bastien

Re: [PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

On Thu, Dec 13, 2012 at 11:15 PM, Bastien <bzg@altern.org> wrote:
> Nicolas Goaziou <n.goaziou@gmail.com> writes:
>
>> Le Wang <l26wang@gmail.com> writes:
>>
>>> Thanks Nicolas.  I have signed assignment papers for Emacs.
>>
>> Great. I have added you to the list of contributors, in Worg.
>
> Note: I did not received confirmation from the FSF yet.
> Le, did you receive it?   To be on the safe side, I try
> to add people on this list only with the FSF copyright
> clerk confirm the author status.  Just double-checking.

I'm not sure how to check, but I signed it and sent it back a while
ago and got a confirmation e-mail from Donald on Aug 9.  AFAIK
everything is sorted.


-- 
Le

Re: [PATCH] org-edit-special too much space if starting with empty block

[Bastien]

Le Wang <l26wang@gmail.com> writes:

> I'm not sure how to check, but I signed it and sent it back a while
> ago and got a confirmation e-mail from Donald on Aug 9.  AFAIK
> everything is sorted.

Okay, thanks for confirming!

-- 
 Bastien

Re: [PATCH] org-edit-special too much space if starting with empty block

[Achim Gratz]

Le Wang writes:
> I'm not sure how to check, but I signed it and sent it back a while
> ago and got a confirmation e-mail from Donald on Aug 9.  AFAIK
> everything is sorted.

Did you just get a confirmation of receipt or a confirmation of the
papers having been signed and accepted?  If the latter, that email
should have had a scan of those papers added as a PDF attachment.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for KORG EX-800 and Poly-800MkII V0.9:
http://Synth.Stromeko.net/Downloads.html#KorgSDada

Re: [PATCH] org-edit-special too much space if starting with empty block

[Le Wang]

On Fri, Dec 14, 2012 at 2:09 AM, Achim Gratz <Stromeko@nexgo.de> wrote:
> Le Wang writes:
>> I'm not sure how to check, but I signed it and sent it back a while
>> ago and got a confirmation e-mail from Donald on Aug 9.  AFAIK
>> everything is sorted.
>
> Did you just get a confirmation of receipt or a confirmation of the
> papers having been signed and accepted?  If the latter, that email
> should have had a scan of those papers added as a PDF attachment.

I have a signed and accepted PDF.  Do you want me to do something with it?


-- 
Le

Re: [PATCH] org-edit-special too much space if starting with empty block

[Bastien]

Le Wang <l26wang@gmail.com> writes:

> I have a signed and accepted PDF.  Do you want me to do something
> with it?

Nope, it is fine.  Thanks Le!

-- 
 Bastien