From b0f9d85bc9e0480f4ebc8a9ce9dd847b34b0cfe7 Mon Sep 17 00:00:00 2001 From: Romain Francoise Date: Fri, 26 Aug 2005 18:03:46 +0000 Subject: [PATCH] * 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'. --- lisp/ChangeLog | 6 ++++++ 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 @@ 2005-08-26 Romain Francoise + * 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'. + * textmodes/sgml-mode.el (sgml-validate): Use `compilation-start' instead of the obsolete `compile-internal'. 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 `antlr-font-lock-maximum-decoration'.") (defvar antlr-default-face 'antlr-default) -(defface antlr-default +(defface antlr-default nil "Face to prevent strings from language dependent highlighting. Do not change." :group 'antlr) @@ -925,7 +925,7 @@ group. The string matched by the first group is highlighted with ("\\$\\sw+" (0 keyword-face)) ;; the tokens are already fontified as string/docstrings: (,(lambda (limit) - (if antlr-literal-regexp + (if antlr-font-lock-literal-regexp (antlr-re-search-forward antlr-font-lock-literal-regexp limit))) (1 antlr-literal-face t) :XEMACS (0 nil)) ; XEmacs bug workaround @@ -2229,6 +2229,8 @@ vocabulary of the super-grammar or nil if it is not needed." (cons (if glibs (concat " -glib " (mapconcat 'car glibs ";")) "") (cons unknown glibs)))) +(autoload 'compilation-start "compile") + (defun antlr-run-tool (command file &optional saved) "Run Antlr took COMMAND on grammar FILE. When called interactively, COMMAND is read from the minibuffer and @@ -2241,9 +2243,8 @@ called interactively, the buffers are always saved, see also variable (interactive (antlr-run-tool-interactive)) (or saved (save-some-buffers (not antlr-ask-about-save))) (let ((default-directory (file-name-directory file))) - (require 'compile) ; only `compile' autoload - (compile-internal (concat command " " (file-name-nondirectory file)) - "No more errors" "Antlr-Run"))) + (compilation-start (concat command " " (file-name-nondirectory file)) + nil #'(lambda (mode-name) "*Antlr-Run*")))) (defun antlr-run-tool-interactive () ;; code in `interactive' is not compiled -- 2.39.2