From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 2 Nov 2018 21:47:11 +0000 (-0400)
Subject: * lisp/emacs-lisp/syntax.el (syntax-propertize-rules): Allow empty rules
X-Git-Tag: emacs-27.0.90~4228
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7b82d514371f77072b30a4a6a75cba6684ea56b4;p=emacs.git

* lisp/emacs-lisp/syntax.el (syntax-propertize-rules): Allow empty rules
---

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