diff options
| author | Romain Francoise | 2005-08-26 18:03:46 +0000 |
|---|---|---|
| committer | Romain Francoise | 2005-08-26 18:03:46 +0000 |
| commit | b0f9d85bc9e0480f4ebc8a9ce9dd847b34b0cfe7 (patch) | |
| tree | 0b6c6b9dc8a65ecc78e2a4349f9ce019e17bfafd /lisp | |
| parent | d182d87ccb4dc7b1ec4a4af15304eb15ce982cb5 (diff) | |
| download | emacs-b0f9d85bc9e0480f4ebc8a9ce9dd847b34b0cfe7.tar.gz emacs-b0f9d85bc9e0480f4ebc8a9ce9dd847b34b0cfe7.zip | |
* progmodes/antlr-mode.el (antlr-default): Fix defface form.
(antlr-font-lock-additional-keywords): Fix reference to
`antlr-font-lock-literal-regexp' erroneously changed during the
mass face rename.
(antlr-run-tool): Use `compilation-start'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/antlr-mode.el | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index abcd1755701..e655c91e613 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -39,6 +39,12 @@ | |||
| 39 | 39 | ||
| 40 | 2005-08-26 Romain Francoise <romain@orebokech.com> | 40 | 2005-08-26 Romain Francoise <romain@orebokech.com> |
| 41 | 41 | ||
| 42 | * progmodes/antlr-mode.el (antlr-default): Fix defface form. | ||
| 43 | (antlr-font-lock-additional-keywords): Fix reference to | ||
| 44 | `antlr-font-lock-literal-regexp' erroneously changed during the | ||
| 45 | mass face rename. | ||
| 46 | (antlr-run-tool): Use `compilation-start'. | ||
| 47 | |||
| 42 | * textmodes/sgml-mode.el (sgml-validate): Use `compilation-start' | 48 | * textmodes/sgml-mode.el (sgml-validate): Use `compilation-start' |
| 43 | instead of the obsolete `compile-internal'. | 49 | instead of the obsolete `compile-internal'. |
| 44 | 50 | ||
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 0415aa910dd..88ad7098c89 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el | |||
| @@ -829,7 +829,7 @@ in the grammar's actions and semantic predicates, see | |||
| 829 | `antlr-font-lock-maximum-decoration'.") | 829 | `antlr-font-lock-maximum-decoration'.") |
| 830 | 830 | ||
| 831 | (defvar antlr-default-face 'antlr-default) | 831 | (defvar antlr-default-face 'antlr-default) |
| 832 | (defface antlr-default | 832 | (defface antlr-default nil |
| 833 | "Face to prevent strings from language dependent highlighting. | 833 | "Face to prevent strings from language dependent highlighting. |
| 834 | Do not change." | 834 | Do not change." |
| 835 | :group 'antlr) | 835 | :group 'antlr) |
| @@ -925,7 +925,7 @@ group. The string matched by the first group is highlighted with | |||
| 925 | ("\\$\\sw+" (0 keyword-face)) | 925 | ("\\$\\sw+" (0 keyword-face)) |
| 926 | ;; the tokens are already fontified as string/docstrings: | 926 | ;; the tokens are already fontified as string/docstrings: |
| 927 | (,(lambda (limit) | 927 | (,(lambda (limit) |
| 928 | (if antlr-literal-regexp | 928 | (if antlr-font-lock-literal-regexp |
| 929 | (antlr-re-search-forward antlr-font-lock-literal-regexp limit))) | 929 | (antlr-re-search-forward antlr-font-lock-literal-regexp limit))) |
| 930 | (1 antlr-literal-face t) | 930 | (1 antlr-literal-face t) |
| 931 | :XEMACS (0 nil)) ; XEmacs bug workaround | 931 | :XEMACS (0 nil)) ; XEmacs bug workaround |
| @@ -2229,6 +2229,8 @@ vocabulary of the super-grammar or nil if it is not needed." | |||
| 2229 | (cons (if glibs (concat " -glib " (mapconcat 'car glibs ";")) "") | 2229 | (cons (if glibs (concat " -glib " (mapconcat 'car glibs ";")) "") |
| 2230 | (cons unknown glibs)))) | 2230 | (cons unknown glibs)))) |
| 2231 | 2231 | ||
| 2232 | (autoload 'compilation-start "compile") | ||
| 2233 | |||
| 2232 | (defun antlr-run-tool (command file &optional saved) | 2234 | (defun antlr-run-tool (command file &optional saved) |
| 2233 | "Run Antlr took COMMAND on grammar FILE. | 2235 | "Run Antlr took COMMAND on grammar FILE. |
| 2234 | When called interactively, COMMAND is read from the minibuffer and | 2236 | When called interactively, COMMAND is read from the minibuffer and |
| @@ -2241,9 +2243,8 @@ called interactively, the buffers are always saved, see also variable | |||
| 2241 | (interactive (antlr-run-tool-interactive)) | 2243 | (interactive (antlr-run-tool-interactive)) |
| 2242 | (or saved (save-some-buffers (not antlr-ask-about-save))) | 2244 | (or saved (save-some-buffers (not antlr-ask-about-save))) |
| 2243 | (let ((default-directory (file-name-directory file))) | 2245 | (let ((default-directory (file-name-directory file))) |
| 2244 | (require 'compile) ; only `compile' autoload | 2246 | (compilation-start (concat command " " (file-name-nondirectory file)) |
| 2245 | (compile-internal (concat command " " (file-name-nondirectory file)) | 2247 | nil #'(lambda (mode-name) "*Antlr-Run*")))) |
| 2246 | "No more errors" "Antlr-Run"))) | ||
| 2247 | 2248 | ||
| 2248 | (defun antlr-run-tool-interactive () | 2249 | (defun antlr-run-tool-interactive () |
| 2249 | ;; code in `interactive' is not compiled | 2250 | ;; code in `interactive' is not compiled |