diff options
| author | Philipp Stephani | 2017-10-15 21:32:17 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2017-12-09 21:05:41 +0100 |
| commit | 6fc0397388c9e03a631806667570959a49b49763 (patch) | |
| tree | 6dc6e9f7c668bf580c86653bed0a1ef00afa8884 /admin | |
| parent | 0ffd3dbce76c1a967522dbe9ec6f2dffe94ee886 (diff) | |
| download | emacs-6fc0397388c9e03a631806667570959a49b49763.tar.gz emacs-6fc0397388c9e03a631806667570959a49b49763.zip | |
Work around reader limitations for old-style backquotes.
See Bug#28759.
* admin/grammars/make.by: Escape ,@ to avoid old-style backquote
detection
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/grammars/make.by | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/admin/grammars/make.by b/admin/grammars/make.by index d3a03ead472..4d029186d86 100644 --- a/admin/grammars/make.by +++ b/admin/grammars/make.by | |||
| @@ -54,15 +54,20 @@ | |||
| 54 | 54 | ||
| 55 | %% | 55 | %% |
| 56 | 56 | ||
| 57 | ;; Escape the ,@ below because the reader doesn't correctly detect | ||
| 58 | ;; old-style backquotes for this case. The backslashes can be removed | ||
| 59 | ;; once old-style backquotes are completely gone (probably in | ||
| 60 | ;; Emacs 28). | ||
| 61 | |||
| 57 | Makefile : bol newline (nil) | 62 | Makefile : bol newline (nil) |
| 58 | | bol variable | 63 | | bol variable |
| 59 | ( ,@$2 ) | 64 | ( \,@$2 ) |
| 60 | | bol rule | 65 | | bol rule |
| 61 | ( ,@$2 ) | 66 | ( \,@$2 ) |
| 62 | | bol conditional | 67 | | bol conditional |
| 63 | ( ,@$2 ) | 68 | ( \,@$2 ) |
| 64 | | bol include | 69 | | bol include |
| 65 | ( ,@$2 ) | 70 | ( \,@$2 ) |
| 66 | | whitespace ( nil ) | 71 | | whitespace ( nil ) |
| 67 | | newline ( nil ) | 72 | | newline ( nil ) |
| 68 | ; | 73 | ; |
| @@ -125,13 +130,13 @@ colons: COLON COLON () | |||
| 125 | ; | 130 | ; |
| 126 | 131 | ||
| 127 | element-list: elements newline | 132 | element-list: elements newline |
| 128 | ( ,@$1 ) | 133 | ( \,@$1 ) |
| 129 | ; | 134 | ; |
| 130 | 135 | ||
| 131 | elements: element some-whitespace elements | 136 | elements: element some-whitespace elements |
| 132 | ( ,@$1 ,@$3 ) | 137 | ( \,@$1 ,@$3 ) |
| 133 | | element | 138 | | element |
| 134 | ( ,@$1 ) | 139 | ( \,@$1 ) |
| 135 | | ;;EMPTY | 140 | | ;;EMPTY |
| 136 | ; | 141 | ; |
| 137 | 142 | ||