From 457e3298de5101eba035ab35bac460106c3587c7 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Sun, 17 Jan 2016 21:59:23 +0100
Subject: [PATCH] `org-font-lock-extra-keywords' is dynamically scoped

Reported-by: mc <mc@aiguphonie.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/104265>
---
 lisp/org.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/org.el b/lisp/org.el
index 3cfdeb10f..b13043015 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -6254,6 +6254,8 @@ There are four matching groups:
 (defvar org-font-lock-hook nil
   "Functions to be called for special font lock stuff.")
 
+(defvar org-font-lock-extra-keywords nil) ;Dynamically scoped.
+
 (defvar org-font-lock-set-keywords-hook nil
   "Functions that can manipulate `org-font-lock-extra-keywords'.
 This is called after `org-font-lock-extra-keywords' is defined, but before