From 7b82d514371f77072b30a4a6a75cba6684ea56b4 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 2 Nov 2018 17:47:11 -0400
Subject: [PATCH] * lisp/emacs-lisp/syntax.el (syntax-propertize-rules): Allow
empty rules
---
lisp/emacs-lisp/syntax.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index ad1a9665ff0..a4b7015f732 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -176,7 +176,7 @@ Note: back-references in REGEXPs do not work."
(re
(mapconcat
(lambda (rule)
- (let* ((orig-re (eval (car rule)))
+ (let* ((orig-re (eval (car rule) t))
(re orig-re))
(when (and (assq 0 rule) (cdr rules))
;; If there's more than 1 rule, and the rule want to apply
@@ -190,7 +190,7 @@ Note: back-references in REGEXPs do not work."
(cond
((assq 0 rule) (if (zerop offset) t
`(match-beginning ,offset)))
- ((null (cddr rule))
+ ((and (cdr rule) (null (cddr rule)))
`(match-beginning ,(+ offset (car (cadr rule)))))
(t
`(or ,@(mapcar
--
2.39.5