]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't assume syntax-begin-function is a symbol.
authorStefan Monnier <monnier@iro.umontreal.ca>
Sun, 20 Sep 2015 16:04:52 +0000 (12:04 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Sun, 20 Sep 2015 16:04:52 +0000 (12:04 -0400)
* lisp/font-lock.el (font-lock-compile-keywords): Don't assume
syntax-begin-function is a symbol.

lisp/font-lock.el

index d93cf7184cab10875e66f9c5f1dedc570f55c3e5..e2660bfab912415be75dd35d57affc4ca36973f5 100644 (file)
@@ -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.