1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00

(compilation-mode-font-lock-keywords):

Redo one more thing that I didn't notice Daniel had undone.
This commit is contained in:
Stefan Monnier 2004-04-08 22:16:14 +00:00
parent 91e88cea86
commit 91fa27cd32
2 changed files with 80 additions and 58 deletions

View File

@ -1,3 +1,8 @@
2004-04-08 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/compile.el (compilation-mode-font-lock-keywords):
Redo one more thing that I didn't notice Daniel had undone.
2004-04-08 Nick Roberts <nick@nick.uklinux.net> 2004-04-08 Nick Roberts <nick@nick.uklinux.net>
* progmodes/gdb-ui.el (gdb-source-window): Remove variable * progmodes/gdb-ui.el (gdb-source-window): Remove variable
@ -87,6 +92,19 @@
* help-mode.el (help-function-def, help-variable-def): Handle hyperrefs * help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
to C source files specially. to C source files specially.
2004-04-07 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/compile.el: Require CL.
(compilation-mode-font-lock-keywords): Re-install the "line as
function" patch.
* help-fns.el (help-C-source-directory): New var.
(help-subr-name, help-C-file-name, help-find-C-source): New funs.
(describe-function-1, describe-variable): Use them.
* help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
to C source files specially.
2004-04-07 Jan Nieuwenhuizen <janneke@gnu.org> 2004-04-07 Jan Nieuwenhuizen <janneke@gnu.org>
* info.el (Info-hide-cookies-node): New function. * info.el (Info-hide-cookies-node): New function.

View File

@ -650,7 +650,10 @@ Faces `compilation-error-face', `compilation-warning-face',
(defun compilation-mode-font-lock-keywords () (defun compilation-mode-font-lock-keywords ()
"Return expressions to highlight in Compilation mode." "Return expressions to highlight in Compilation mode."
(nconc (if compilation-parse-errors-function
;; An old package! Try the compatibility code.
'((compilation-compat-parse-errors))
(append
;; make directory tracking ;; make directory tracking
(if compilation-directory-matcher (if compilation-directory-matcher
`((,(car compilation-directory-matcher) `((,(car compilation-directory-matcher)
@ -662,7 +665,8 @@ Faces `compilation-error-face', `compilation-warning-face',
(cdr compilation-directory-matcher))))) (cdr compilation-directory-matcher)))))
;; Compiler warning/error lines. ;; Compiler warning/error lines.
(mapcar (lambda (item) (mapcar
(lambda (item)
(if (symbolp item) (if (symbolp item)
(setq item (cdr (assq item (setq item (cdr (assq item
compilation-error-regexp-alist-alist)))) compilation-error-regexp-alist-alist))))
@ -715,7 +719,7 @@ Faces `compilation-error-face', `compilation-warning-face',
append))))) ; for compilation-message-face append))))) ; for compilation-message-face
compilation-error-regexp-alist) compilation-error-regexp-alist)
compilation-mode-font-lock-keywords)) compilation-mode-font-lock-keywords)))
;;;###autoload ;;;###autoload