/[emacs]/emacs/lisp/progmodes/compile.el
ViewVC logotype

Diff of /emacs/lisp/progmodes/compile.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.369 by jurta, Sat Aug 6 01:10:09 2005 UTC revision 1.370 by jurta, Tue Aug 9 21:34:40 2005 UTC
# Line 377  you may also want to change `compilation Line 377  you may also want to change `compilation
377     '(;; configure output lines.     '(;; configure output lines.
378       ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$"       ("^[Cc]hecking \\(?:[Ff]or \\|[Ii]f \\|[Ww]hether \\(?:to \\)?\\)?\\(.+\\)\\.\\.\\. *\\(?:(cached) *\\)?\\(\\(yes\\(?: .+\\)?\\)\\|no\\|\\(.*\\)\\)$"
379        (1 font-lock-variable-name-face)        (1 font-lock-variable-name-face)
380        (2 (compilation-text-face '(4 . 3))))        (2 (compilation-face '(4 . 3))))
381       ;; Command output lines.  Recognize `make[n]:' lines too.       ;; Command output lines.  Recognize `make[n]:' lines too.
382       ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"       ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
383        (1 font-lock-function-name-face) (3 compilation-line-face nil t))        (1 font-lock-function-name-face) (3 compilation-line-face nil t))
384       (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)       (" --?o\\(?:utfile\\|utput\\)?[= ]?\\(\\S +\\)" . 1)
385       ("^Compilation finished" . compilation-info-text-face)       ("^Compilation finished" . compilation-info-face)
386       ("^Compilation exited abnormally" . compilation-error-text-face))       ("^Compilation exited abnormally" . compilation-error-face))
387     "Additional things to highlight in Compilation mode.     "Additional things to highlight in Compilation mode.
388  This gets tacked on the end of the generated expressions.")  This gets tacked on the end of the generated expressions.")
389    
# Line 499  starting the compilation process.") Line 499  starting the compilation process.")
499  ;; backward-compatibility alias  ;; backward-compatibility alias
500  (put 'compilation-info-face 'face-alias 'compilation-info)  (put 'compilation-info-face 'face-alias 'compilation-info)
501    
 (defface compilation-error-file-name  
   '((default :inherit compilation-error)  
     (((supports :underline t)) :underline t))  
   "Face for displaying file names in error messages."  
   :group 'font-lock-highlighting-faces  
   :version "22.1")  
   
 (defface compilation-warning-file-name  
   '((default :inherit compilation-warning)  
     (((supports :underline t)) :underline t))  
   "Face for displaying file names in warning messages."  
   :group 'font-lock-highlighting-faces  
   :version "22.1")  
   
 (defface compilation-info-file-name  
   '((default :inherit compilation-info)  
     (((supports :underline t)) :underline t))  
   "Face for displaying file names in informational messages."  
   :group 'font-lock-highlighting-faces  
   :version "22.1")  
   
502  (defface compilation-line-number  (defface compilation-line-number
503    '((default :inherit font-lock-variable-name-face)    '((t :inherit font-lock-variable-name-face))
     (((supports :underline t)) :underline t))  
504    "Face for displaying line numbers in compiler messages."    "Face for displaying line numbers in compiler messages."
505    :group 'font-lock-highlighting-faces    :group 'font-lock-highlighting-faces
506    :version "22.1")    :version "22.1")
507    
508  (defface compilation-column-number  (defface compilation-column-number
509    '((default :inherit font-lock-type-face)    '((t :inherit font-lock-type-face))
     (((supports :underline t)) :underline t))  
510    "Face for displaying column numbers in compiler messages."    "Face for displaying column numbers in compiler messages."
511    :group 'font-lock-highlighting-faces    :group 'font-lock-highlighting-faces
512    :version "22.1")    :version "22.1")
513    
514  (defvar compilation-message-face nil  (defvar compilation-message-face 'underline
515    "Face name to use for whole messages.    "Face name to use for whole messages.
516  Faces `compilation-error-face', `compilation-warning-face',  Faces `compilation-error-face', `compilation-warning-face',
517  `compilation-info-face', `compilation-line-face' and  `compilation-info-face', `compilation-line-face' and
518  `compilation-column-face' get prepended to this, when applicable.")  `compilation-column-face' get prepended to this, when applicable.")
519    
520  (defvar compilation-error-face 'compilation-error-file-name  (defvar compilation-error-face 'compilation-error
521    "Face name to use for file name in error messages.")    "Face name to use for file name in error messages.")
522    
523  (defvar compilation-error-text-face 'compilation-error  (defvar compilation-warning-face 'compilation-warning
   "Face name to use for text of error messages.")  
   
 (defvar compilation-warning-face 'compilation-warning-file-name  
524    "Face name to use for file name in warning messages.")    "Face name to use for file name in warning messages.")
525    
526  (defvar compilation-warning-text-face 'compilation-warning  (defvar compilation-info-face 'compilation-info
   "Face name to use for text of warning messages.")  
   
 (defvar compilation-info-face 'compilation-info-file-name  
527    "Face name to use for file name in informational messages.")    "Face name to use for file name in informational messages.")
528    
 (defvar compilation-info-text-face 'compilation-info  
   "Face name to use for text of informational messages.")  
   
529  (defvar compilation-line-face 'compilation-line-number  (defvar compilation-line-face 'compilation-line-number
530    "Face name to use for line numbers in compiler message.")    "Face name to use for line numbers in compiler messages.")
531    
532  (defvar compilation-column-face 'compilation-column-number  (defvar compilation-column-face 'compilation-column-number
533    "Face name to use for column numbers in compiler messages.")    "Face name to use for column numbers in compiler messages.")
# Line 585  Faces `compilation-error-face', `compila Line 553  Faces `compilation-error-face', `compila
553        (and (cdr type) (match-end (cdr type)) compilation-info-face)        (and (cdr type) (match-end (cdr type)) compilation-info-face)
554        compilation-error-face))        compilation-error-face))
555    
 (defun compilation-text-face (type)  
   (or (and (car type) (match-end (car type)) compilation-warning-text-face)  
       (and (cdr type) (match-end (cdr type)) compilation-info-text-face)  
       compilation-error-text-face))  
   
556  ;; Internal function for calculating the text properties of a directory  ;; Internal function for calculating the text properties of a directory
557  ;; change message.  The directory property is important, because it is  ;; change message.  The directory property is important, because it is
558  ;; the stack of nested enter-messages.  Relative filenames on the following  ;; the stack of nested enter-messages.  Relative filenames on the following

Legend:
Removed from v.1.369  
changed lines
  Added in v.1.370

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26