emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Fix some #+ blocks fontification when there is no lang attribute
@ 2011-07-01 14:46 julien Barnier
  2011-07-01 15:29 ` Bastien
  0 siblings, 1 reply; 5+ messages in thread
From: julien Barnier @ 2011-07-01 14:46 UTC (permalink / raw)
  To: emacs-orgmode

* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src blocks
lang attribute

When there is no lang attribute to a block (for quote, verse or others), the
lang variable is not nil, but an empty string.
---
 lisp/org.el |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index 9fddf3f..fb1041d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5207,7 +5207,7 @@ will be prompted for."
              (add-text-properties end1 (+ end 1) '(face org-meta-line))
                                        ; for end_src
              (cond
-              ((and lang org-src-fontify-natively)
+              ((and lang (not (string= lang "")) org-src-fontify-natively)
                (org-src-font-lock-fontify-block lang block-start block-end)
                ;; remove old background overlays
                (mapc (lambda (ov)
-- 
1.7.5.4

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

* Re: [PATCH] Fix some #+ blocks fontification when there is no lang attribute
  2011-07-01 14:46 [PATCH] Fix some #+ blocks fontification when there is no lang attribute julien Barnier
@ 2011-07-01 15:29 ` Bastien
  2011-07-02  0:03   ` Julien Barnier
  0 siblings, 1 reply; 5+ messages in thread
From: Bastien @ 2011-07-01 15:29 UTC (permalink / raw)
  To: julien Barnier; +Cc: emacs-orgmode

Hi Julien,

julien Barnier <julien@nozav.org> writes:

> * lisp/org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src blocks
> lang attribute
>
> When there is no lang attribute to a block (for quote, verse or others), the
> lang variable is not nil, but an empty string.

Applied, thanks!

-- 
 Bastien

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

* Re: [PATCH] Fix some #+ blocks fontification when there is no lang attribute
  2011-07-01 15:29 ` Bastien
@ 2011-07-02  0:03   ` Julien Barnier
  2011-07-02  0:38     ` Eric Schulte
  0 siblings, 1 reply; 5+ messages in thread
From: Julien Barnier @ 2011-07-02  0:03 UTC (permalink / raw)
  To: emacs-orgmode

Hi Bastien,

Bastien <bzg <at> altern.org> writes:

> > * lisp/org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src blocks
> > lang attribute
> >
> > When there is no lang attribute to a block (for quote, verse or others), the
> > lang variable is not nil, but an empty string.
> 
> Applied, thanks!

Maybe I'm mistaken, but I think there is a problem with the patch : in the patch
file I sent the new line was the following :

((and lang (not (string= lang "")) org-src-fontify-natively)

But it seems that the applied patch in the git repository is the following :

((and lang (not (string= lang "") org-src-fontify-natively))

http://repo.or.cz/w/org-mode.git/commitdiff/549a5212566e300023e038ec945cb9e8efe37e19

As you can see, the parenthesis is not at the right place, and this seems to
break completely src code blocks fontification...

Thanks in advance,

Julien

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

* Re: [PATCH] Fix some #+ blocks fontification when there is no lang attribute
  2011-07-02  0:03   ` Julien Barnier
@ 2011-07-02  0:38     ` Eric Schulte
  2011-07-02  9:07       ` Bastien
  0 siblings, 1 reply; 5+ messages in thread
From: Eric Schulte @ 2011-07-02  0:38 UTC (permalink / raw)
  To: Julien Barnier; +Cc: emacs-orgmode

Julien Barnier <julien@nozav.org> writes:

> Hi Bastien,
>
> Bastien <bzg <at> altern.org> writes:
>
>> > * lisp/org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src blocks
>> > lang attribute
>> >
>> > When there is no lang attribute to a block (for quote, verse or others), the
>> > lang variable is not nil, but an empty string.
>> 
>> Applied, thanks!
>
> Maybe I'm mistaken, but I think there is a problem with the patch : in the patch
> file I sent the new line was the following :
>
> ((and lang (not (string= lang "")) org-src-fontify-natively)
>
> But it seems that the applied patch in the git repository is the following :
>
> ((and lang (not (string= lang "") org-src-fontify-natively))
>
> http://repo.or.cz/w/org-mode.git/commitdiff/549a5212566e300023e038ec945cb9e8efe37e19
>
> As you can see, the parenthesis is not at the right place, and this seems to
> break completely src code blocks fontification...
>
> Thanks in advance,
>

Fixed.  Thanks for reporting -- Eric

-- 
Eric Schulte
http://cs.unm.edu/~eschulte/

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

* Re: [PATCH] Fix some #+ blocks fontification when there is no lang attribute
  2011-07-02  0:38     ` Eric Schulte
@ 2011-07-02  9:07       ` Bastien
  0 siblings, 0 replies; 5+ messages in thread
From: Bastien @ 2011-07-02  9:07 UTC (permalink / raw)
  To: Eric Schulte; +Cc: Julien Barnier, emacs-orgmode

Eric Schulte <schulte.eric@gmail.com> writes:

> Fixed.  Thanks for reporting -- Eric

Er, thanks for fixing this typo Eric.

-- 
 Bastien

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

end of thread, other threads:[~2011-07-02  9:06 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-01 14:46 [PATCH] Fix some #+ blocks fontification when there is no lang attribute julien Barnier
2011-07-01 15:29 ` Bastien
2011-07-02  0:03   ` Julien Barnier
2011-07-02  0:38     ` Eric Schulte
2011-07-02  9:07       ` Bastien

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).