* Fix for org-mode fontification (Bug#25132) fix on emacs-25?
@ 2017-03-21 2:11 Noam Postavsky
2017-03-21 3:30 ` Eli Zaretskii
0 siblings, 1 reply; 3+ messages in thread
From: Noam Postavsky @ 2017-03-21 2:11 UTC (permalink / raw)
To: Emacs developers
Hi,
I goofed when pushing the fix for Bug#25132, for some reason I decided
to extend let-binding wider than my initial patch. This causes a
fontification error when combined with some other (undetermined, but
Spacemacs was mentioned) packages [1].
Fixed with the diff below (ignoring whitespace changes for
readability) which narrows the scope of the let-binding (the
let-binding was introduced for 25.2 to fix #25132). Should this go to
emacs-25?
diff --git i/lisp/org/org-src.el w/lisp/org/org-src.el
index a02402cf60..16aa443232 100644
--- i/lisp/org/org-src.el
+++ w/lisp/org/org-src.el
@@ -917,17 +917,17 @@ org-src-font-lock-fontify-block
;; the org-src-fontification buffer in case we're called
;; from `jit-lock-function' (Bug#25132).
(let ((inhibit-modification-hooks nil))
(delete-region (point-min) (point-max))
- (insert string " ") ;; so there's a final property change
+ (insert string " ")) ;; so there's a final property change
(unless (eq major-mode lang-mode) (funcall lang-mode))
(org-font-lock-ensure)
(setq pos (point-min))
(while (setq next (next-single-property-change pos 'face))
(put-text-property
(+ start (1- pos)) (1- (+ start next)) 'face
(get-text-property pos 'face) org-buffer)
- (setq pos next))))
+ (setq pos next)))
(add-text-properties
start end
'(font-lock-fontified t fontified t font-lock-multiline t))
(set-buffer-modified-p modified)))))
[1]: http://lists.gnu.org/archive/html/emacs-orgmode/2017-03/msg00420.html
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: Fix for org-mode fontification (Bug#25132) fix on emacs-25?
2017-03-21 2:11 Fix for org-mode fontification (Bug#25132) fix on emacs-25? Noam Postavsky
@ 2017-03-21 3:30 ` Eli Zaretskii
2017-03-21 13:23 ` Noam Postavsky
0 siblings, 1 reply; 3+ messages in thread
From: Eli Zaretskii @ 2017-03-21 3:30 UTC (permalink / raw)
To: Noam Postavsky; +Cc: emacs-devel
> From: Noam Postavsky <npostavs@users.sourceforge.net>
> Date: Mon, 20 Mar 2017 22:11:45 -0400
>
> I goofed when pushing the fix for Bug#25132, for some reason I decided
> to extend let-binding wider than my initial patch. This causes a
> fontification error when combined with some other (undetermined, but
> Spacemacs was mentioned) packages [1].
>
> Fixed with the diff below (ignoring whitespace changes for
> readability) which narrows the scope of the let-binding (the
> let-binding was introduced for 25.2 to fix #25132). Should this go to
> emacs-25?
Yes, emacs-25 is fine for this. Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Fix for org-mode fontification (Bug#25132) fix on emacs-25?
2017-03-21 3:30 ` Eli Zaretskii
@ 2017-03-21 13:23 ` Noam Postavsky
0 siblings, 0 replies; 3+ messages in thread
From: Noam Postavsky @ 2017-03-21 13:23 UTC (permalink / raw)
To: Eli Zaretskii; +Cc: Emacs developers
On Mon, Mar 20, 2017 at 11:30 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Noam Postavsky <npostavs@users.sourceforge.net>
>> Date: Mon, 20 Mar 2017 22:11:45 -0400
>>
>> I goofed when pushing the fix for Bug#25132, for some reason I decided
>> to extend let-binding wider than my initial patch. This causes a
>> fontification error when combined with some other (undetermined, but
>> Spacemacs was mentioned) packages [1].
>>
>> Fixed with the diff below (ignoring whitespace changes for
>> readability) which narrows the scope of the let-binding (the
>> let-binding was introduced for 25.2 to fix #25132). Should this go to
>> emacs-25?
>
> Yes, emacs-25 is fine for this. Thanks.
Done [1: d38fd9229c].
1: 2017-03-21 09:19:57 -0400 d38fd9229c07c531ebc0bec0ea65f7d7dffcd983
Narrow scope of modification hook renabling in org-src fontification
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-21 13:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-21 2:11 Fix for org-mode fontification (Bug#25132) fix on emacs-25? Noam Postavsky
2017-03-21 3:30 ` Eli Zaretskii
2017-03-21 13:23 ` Noam Postavsky
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.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).