diff options
| author | Andreas Schwab | 2011-11-26 10:10:36 +0100 |
|---|---|---|
| committer | Andreas Schwab | 2011-11-26 10:10:36 +0100 |
| commit | 509c74bd24fb1b32ccbe09be5ecb724590916e08 (patch) | |
| tree | c6a902af0a6dc6d2f7ba6914c1fc24529baf3dd7 | |
| parent | 00db469c65f52f86402bcce684fe48ab5c612861 (diff) | |
| download | emacs-509c74bd24fb1b32ccbe09be5ecb724590916e08.tar.gz emacs-509c74bd24fb1b32ccbe09be5ecb724590916e08.zip | |
* grammars/bovine-grammar.el (auto-mode-alist): Change `$' to `\''
in regexp.
(bovine-make-parsers): Likewise. Quote `.'.
* grammars/wisent-grammar.el (auto-mode-alist): Change `$' to `\''
in regexp.
(wisent-make-parsers): Likewise. Quote `.'.
| -rw-r--r-- | admin/ChangeLog | 10 | ||||
| -rw-r--r-- | admin/grammars/bovine-grammar.el | 6 | ||||
| -rw-r--r-- | admin/grammars/wisent-grammar.el | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 94cf71162df..34619a759c4 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * grammars/wisent-grammar.el (auto-mode-alist): Change `$' to `\'' | ||
| 4 | in regexp. | ||
| 5 | (wisent-make-parsers): Likewise. Quote `.'. | ||
| 6 | |||
| 7 | * grammars/bovine-grammar.el (auto-mode-alist): Change `$' to `\'' | ||
| 8 | in regexp. | ||
| 9 | (bovine-make-parsers): Likewise. Quote `.'. | ||
| 10 | |||
| 1 | 2011-11-20 Andreas Schwab <schwab@linux-m68k.org> | 11 | 2011-11-20 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 12 | ||
| 3 | * CPP-DEFINES (VIRT_ADDR_VARIES): Remove. | 13 | * CPP-DEFINES (VIRT_ADDR_VARIES): Remove. |
diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el index 3ff15fab66f..2201668731d 100644 --- a/admin/grammars/bovine-grammar.el +++ b/admin/grammars/bovine-grammar.el | |||
| @@ -434,7 +434,7 @@ Menu items are appended to the common grammar menu.") | |||
| 434 | (grammar-setupcode-builder . bovine-grammar-setupcode-builder) | 434 | (grammar-setupcode-builder . bovine-grammar-setupcode-builder) |
| 435 | ))) | 435 | ))) |
| 436 | 436 | ||
| 437 | (add-to-list 'auto-mode-alist '("\\.by$" . bovine-grammar-mode)) | 437 | (add-to-list 'auto-mode-alist '("\\.by\\'" . bovine-grammar-mode)) |
| 438 | 438 | ||
| 439 | (defvar-mode-local bovine-grammar-mode semantic-grammar-macros | 439 | (defvar-mode-local bovine-grammar-mode semantic-grammar-macros |
| 440 | '( | 440 | '( |
| @@ -459,7 +459,7 @@ Menu items are appended to the common grammar menu.") | |||
| 459 | (semantic-mode 1) | 459 | (semantic-mode 1) |
| 460 | ;; Loop through each .by file in current directory, and run | 460 | ;; Loop through each .by file in current directory, and run |
| 461 | ;; `semantic-grammar-batch-build-one-package' to build the grammar. | 461 | ;; `semantic-grammar-batch-build-one-package' to build the grammar. |
| 462 | (dolist (f (directory-files default-directory nil ".by$")) | 462 | (dolist (f (directory-files default-directory nil "\\.by\\'")) |
| 463 | (let ((packagename | 463 | (let ((packagename |
| 464 | (condition-case err | 464 | (condition-case err |
| 465 | (with-current-buffer (find-file-noselect f) | 465 | (with-current-buffer (find-file-noselect f) |
| @@ -467,7 +467,7 @@ Menu items are appended to the common grammar menu.") | |||
| 467 | (error (message "%s" (error-message-string err)) nil))) | 467 | (error (message "%s" (error-message-string err)) nil))) |
| 468 | lang) | 468 | lang) |
| 469 | (when (and packagename | 469 | (when (and packagename |
| 470 | (string-match "^semantic-\\(.*\\)-by.el$" packagename)) | 470 | (string-match "^semantic-\\(.*\\)-by\\.el\\'" packagename)) |
| 471 | (setq lang (match-string 1 packagename)) | 471 | (setq lang (match-string 1 packagename)) |
| 472 | (with-temp-buffer | 472 | (with-temp-buffer |
| 473 | (insert-file-contents packagename) | 473 | (insert-file-contents packagename) |
diff --git a/admin/grammars/wisent-grammar.el b/admin/grammars/wisent-grammar.el index 98b0caee60b..66045c2294d 100644 --- a/admin/grammars/wisent-grammar.el +++ b/admin/grammars/wisent-grammar.el | |||
| @@ -331,7 +331,7 @@ Menu items are appended to the common grammar menu.") | |||
| 331 | (grammar-setupcode-builder . wisent-grammar-setupcode-builder) | 331 | (grammar-setupcode-builder . wisent-grammar-setupcode-builder) |
| 332 | ))) | 332 | ))) |
| 333 | 333 | ||
| 334 | (add-to-list 'auto-mode-alist '("\\.wy$" . wisent-grammar-mode)) | 334 | (add-to-list 'auto-mode-alist '("\\.wy\\'" . wisent-grammar-mode)) |
| 335 | 335 | ||
| 336 | (defvar-mode-local wisent-grammar-mode semantic-grammar-macros | 336 | (defvar-mode-local wisent-grammar-mode semantic-grammar-macros |
| 337 | '( | 337 | '( |
| @@ -484,7 +484,7 @@ Menu items are appended to the common grammar menu.") | |||
| 484 | (semantic-mode 1) | 484 | (semantic-mode 1) |
| 485 | ;; Loop through each .wy file in current directory, and run | 485 | ;; Loop through each .wy file in current directory, and run |
| 486 | ;; `semantic-grammar-batch-build-one-package' to build the grammar. | 486 | ;; `semantic-grammar-batch-build-one-package' to build the grammar. |
| 487 | (dolist (f (directory-files default-directory nil ".wy$")) | 487 | (dolist (f (directory-files default-directory nil "\\.wy\\'")) |
| 488 | (let ((packagename | 488 | (let ((packagename |
| 489 | (condition-case err | 489 | (condition-case err |
| 490 | (with-current-buffer (find-file-noselect f) | 490 | (with-current-buffer (find-file-noselect f) |