emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 9474c70: Don't assume syntax-begin-function is a sy


From: Stefan Monnier
Subject: [Emacs-diffs] master 9474c70: Don't assume syntax-begin-function is a symbol.
Date: Sun, 20 Sep 2015 16:04:56 +0000

branch: master
commit 9474c70a8442e052bd7b192a515a4fdb1834f49a
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    Don't assume syntax-begin-function is a symbol.
    
    * lisp/font-lock.el (font-lock-compile-keywords): Don't assume
    syntax-begin-function is a symbol.
---
 lisp/font-lock.el |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index d93cf71..e2660bf 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1752,7 +1752,8 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords 
are used for
     (if (and (not syntactic-keywords)
             (let ((beg-function syntax-begin-function))
               (or (eq beg-function 'beginning-of-defun)
-                  (get beg-function 'font-lock-syntax-paren-check)))
+                   (if (symbolp beg-function)
+                       (get beg-function 'font-lock-syntax-paren-check))))
             (not beginning-of-defun-function))
        ;; Try to detect when a string or comment contains something that
        ;; looks like a defun and would thus confuse font-lock.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]