Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
On 03/14/2014 02:00 AM, Bastien wrote: > Hi Florian, > > Florian Beck writes: > >> On 13.03.2014 20:46, Bastien wrote: >>> Ok, let me take some fresh air and come back to this later on. >> >> How about this: >> >> (while (re-search-forward "\\(^\\).+" nil t) >> (replace-match indent nil nil nil 1))) > > Works fine here, I pushed this solution. Thanks! Thanks everyone for fixing this! Arun
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Hi Florian, Florian Beck writes: > On 13.03.2014 20:46, Bastien wrote: >> Ok, let me take some fresh air and come back to this later on. > > How about this: > > (while (re-search-forward "\\(^\\).+" nil t) > (replace-match indent nil nil nil 1))) Works fine here, I pushed this solution. Thanks! -- Bastien
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
On 13.03.2014 20:46, Bastien wrote: Ok, let me take some fresh air and come back to this later on. How about this: (while (re-search-forward "\\(^\\).+" nil t) (replace-match indent nil nil nil 1))) -- Florian Beck
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
On Thu, 13 Mar 2014, Bastien wrote: Charles Berry writes: Bastien gnu.org> writes: Charles Berry ucsd.edu> writes: Time to failure seems longer. But now I get an infinite loop. Er, sorry for the confusion; should be fixed again. It is not. I am now back to getting the 'End of Buffer' msg Ok, let me take some fresh air and come back to this later on. Perhaps - (forward-char 1 + (forward-line 1 as the latter will not throw an error when (eobp) ? Chuck
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Charles Berry writes: > Bastien gnu.org> writes: > >> >> Charles Berry ucsd.edu> writes: >> >> > Time to failure seems longer. But now I get an infinite loop. >> >> Er, sorry for the confusion; should be fixed again. > > It is not. I am now back to getting the 'End of Buffer' msg Ok, let me take some fresh air and come back to this later on. -- Bastien
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Bastien gnu.org> writes: > > Charles Berry ucsd.edu> writes: > > > Time to failure seems longer. But now I get an infinite loop. > > Er, sorry for the confusion; should be fixed again. > It is not. I am now back to getting the 'End of Buffer' msg Chuck
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Charles Berry writes: > Time to failure seems longer. But now I get an infinite loop. Er, sorry for the confusion; should be fixed again. -- Bastien
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Bastien gnu.org> writes: > > Hi Charles, > > Charles Berry ucsd.edu> writes: > > > This seems to have broken org-edit-src-exit. > > > > I cannot figure out what triggers it (hence no ECM), but I sometimes > > get an > > 'End of buffer' error from inside the while loop. > > I just pushed a fix. Can you confirm you don't see the error anymore? > Time to failure seems longer. But now I get an infinite loop. The error message is gone. C-g stops the loop, but attempting to exit via C-c ' re-indents the code and the loop starts again. Chuck
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Hi Charles, Charles Berry writes: > This seems to have broken org-edit-src-exit. :-( > > I cannot figure out what triggers it (hence no ECM), but I sometimes get an > 'End of buffer' error from inside the while loop. I just pushed a fix. Can you confirm you don't see the error anymore? Thanks! -- Bastien
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Bastien gnu.org> writes: > > Hi Arun, > > Arun Persaud lbl.gov> writes: > > > I tried to fix this in org. It seems to work over here, but my elisp as > > well as my understanding of org-mode is not perfect ;) Let me know if it > > needs more work. > > Applied, thanks! > Bastien, This seems to have broken org-edit-src-exit. :-( I cannot figure out what triggers it (hence no ECM), but I sometimes get an 'End of buffer' error from inside the while loop. I cannot exit the src edit buffer until I revert org-edit-src-exit to its old version. HTH, Chuck
Re: [O] [Patch] don't add indent for empty line when exiting, a code edit
Hi Arun, Arun Persaud writes: > I tried to fix this in org. It seems to work over here, but my elisp as > well as my understanding of org-mode is not perfect ;) Let me know if it > needs more work. Applied, thanks! -- Bastien
[O] [Patch] don't add indent for empty line when exiting, a code edit
Hi I started using org babel for python, but when using C-c ' I always ended up with white space added to the empty lines in the source code when returning into the org buffer. This especially shows up (setq-default show-trailing-whitespace t). I tried to fix this in org. It seems to work over here, but my elisp as well as my understanding of org-mode is not perfect ;) Let me know if it needs more work. Arun >From e393fed9dbb132fdefff66d304f67f7def643140 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Mon, 10 Mar 2014 17:09:12 -0700 Subject: [PATCH] lisp/org-src.el: don't add indent for empty line when exiting a code edit Using C-c ' to edit code blocks adds an indent to all lines when exiting from the code edit. This leaves trailing whitespace in the buffer, which can be especially annoying when using show-trailing-whitespace. --- lisp/org-src.el | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/org-src.el b/lisp/org-src.el index d1f6879..ef09bd6 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -737,8 +737,10 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"." (unless (or single preserve-indentation (= total-nindent 0)) (setq indent (make-string total-nindent ?\ )) (goto-char (point-min)) - (while (re-search-forward "^" nil t) - (replace-match indent))) +(while (re-search-forward "^" nil t) + (if (not (looking-at "$")) + (replace-match indent) + (forward-char 1 (if (org-bound-and-true-p org-edit-src-picture) (setq total-nindent (+ total-nindent 2))) (setq code (buffer-string)) -- 1.9.0
