diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-03-14 23:24:49 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-03-14 23:24:49 +0900 |
| commit | 7a7bc15242896b20c7af49f77f0e22c3d78e4d88 (patch) | |
| tree | 1931644be0ecdfe850975a98d8a665ea1734e49b /lisp/emacs-lisp/syntax.el | |
| parent | 56297c0f426314dde66614a5c4e459c285af939a (diff) | |
| parent | f9b737fb9d21ac7adff403274167e76e77d033b8 (diff) | |
| download | emacs-7a7bc15242896b20c7af49f77f0e22c3d78e4d88.tar.gz emacs-7a7bc15242896b20c7af49f77f0e22c3d78e4d88.tar.bz2 emacs-7a7bc15242896b20c7af49f77f0e22c3d78e4d88.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/emacs-lisp/syntax.el')
| -rw-r--r-- | lisp/emacs-lisp/syntax.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index bee2f9639e7..6d5b04b83bb 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -290,12 +290,13 @@ all RULES in total." ',(string-to-syntax (nth 1 action))) ,@(nthcdr 2 action)) `((let ((mb (match-beginning ,gn)) - (me (match-end ,gn)) - (syntax ,(nth 1 action))) - (if syntax - (put-text-property - mb me 'syntax-table syntax)) - ,@(nthcdr 2 action))))) + (me (match-end ,gn))) + ,(macroexp-let2 nil syntax (nth 1 action) + `(progn + (if ,syntax + (put-text-property + mb me 'syntax-table ,syntax)) + ,@(nthcdr 2 action))))))) (t `((let ((mb (match-beginning ,gn)) (me (match-end ,gn)) |