comparison lisp/font-lock.el @ 410:de805c49cfc1 r21-2-35

Import from CVS: tag r21-2-35
author cvs
date Mon, 13 Aug 2007 11:19:21 +0200
parents 501cfd01ee6d
children 697ef44129c6
comparison
equal deleted inserted replaced
409:301b9ebbdf3b 410:de805c49cfc1
578 578
579 ;;; Initialization of faces. 579 ;;; Initialization of faces.
580 580
581 ;; #### barf gag retch. Horrid FSF lossage that we need to 581 ;; #### barf gag retch. Horrid FSF lossage that we need to
582 ;; keep around for compatibility with font-lock-keywords that 582 ;; keep around for compatibility with font-lock-keywords that
583 ;; forget to properly quote their faces. 583 ;; forget to properly quote their faces. I tried just let-binding
584 ;; them when we eval the face expression, but that failes because
585 ;; some files actually use the variables directly in their init code
586 ;; without quoting them. --ben
584 (defvar font-lock-comment-face 'font-lock-comment-face 587 (defvar font-lock-comment-face 'font-lock-comment-face
585 "Don't even think of using this.") 588 "This variable should not be set.
589 It is present only for horrid FSF compatibility reasons.
590 The corresponding face should be set using `edit-faces' or the
591 `set-face-*' functions.")
586 (defvar font-lock-doc-string-face 'font-lock-doc-string-face 592 (defvar font-lock-doc-string-face 'font-lock-doc-string-face
587 "Don't even think of using this.") 593 "This variable should not be set.
594 It is present only for horrid FSF compatibility reasons.
595 The corresponding face should be set using `edit-faces' or the
596 `set-face-*' functions.")
588 (defvar font-lock-string-face 'font-lock-string-face 597 (defvar font-lock-string-face 'font-lock-string-face
589 "Don't even think of using this.") 598 "This variable should not be set.
599 It is present only for horrid FSF compatibility reasons.
600 The corresponding face should be set using `edit-faces' or the
601 `set-face-*' functions.")
590 (defvar font-lock-keyword-face 'font-lock-keyword-face 602 (defvar font-lock-keyword-face 'font-lock-keyword-face
591 "Don't even think of using this.") 603 "This variable should not be set.
604 It is present only for horrid FSF compatibility reasons.
605 The corresponding face should be set using `edit-faces' or the
606 `set-face-*' functions.")
592 (defvar font-lock-function-name-face 'font-lock-function-name-face 607 (defvar font-lock-function-name-face 'font-lock-function-name-face
593 "Don't even think of using this.") 608 "This variable should not be set.
609 It is present only for horrid FSF compatibility reasons.
610 The corresponding face should be set using `edit-faces' or the
611 `set-face-*' functions.")
594 (defvar font-lock-variable-name-face 'font-lock-variable-name-face 612 (defvar font-lock-variable-name-face 'font-lock-variable-name-face
595 "Don't even think of using this.") 613 "This variable should not be set.
614 It is present only for horrid FSF compatibility reasons.
615 The corresponding face should be set using `edit-faces' or the
616 `set-face-*' functions.")
596 (defvar font-lock-type-face 'font-lock-type-face 617 (defvar font-lock-type-face 'font-lock-type-face
597 "Don't even think of using this.") 618 "This variable should not be set.
619 It is present only for horrid FSF compatibility reasons.
620 The corresponding face should be set using `edit-faces' or the
621 `set-face-*' functions.")
598 (defvar font-lock-reference-face 'font-lock-reference-face 622 (defvar font-lock-reference-face 'font-lock-reference-face
599 "Don't even think of using this.") 623 "This variable should not be set.
624 It is present only for horrid FSF compatibility reasons.
625 The corresponding face should be set using `edit-faces' or the
626 `set-face-*' functions.")
600 (defvar font-lock-preprocessor-face 'font-lock-preprocessor-face 627 (defvar font-lock-preprocessor-face 'font-lock-preprocessor-face
601 "Don't even think of using this.") 628 "This variable should not be set.
629 It is present only for horrid FSF compatibility reasons.
630 The corresponding face should be set using `edit-faces' or the
631 `set-face-*' functions.")
602 632
603 (defconst font-lock-face-list 633 (defconst font-lock-face-list
604 '(font-lock-comment-face 634 '(font-lock-comment-face
605 font-lock-string-face 635 font-lock-string-face
606 font-lock-doc-string-face 636 font-lock-doc-string-face
1175 ;; now and is bit-rotting. Someone should look into 1205 ;; now and is bit-rotting. Someone should look into
1176 ;; this. 1206 ;; this.
1177 ;; (if (or change-was-deletion (bobp) 1207 ;; (if (or change-was-deletion (bobp)
1178 ;; (= (preceding-char) ?\n)) 1208 ;; (= (preceding-char) ?\n))
1179 ;; (buffer-syntactic-context-flush-cache)) 1209 ;; (buffer-syntactic-context-flush-cache))
1180 (if (and (= beg (point-min)) 1210 ;; #### This creates some unnecessary progress gauges.
1181 (= end (point-max))) 1211 ;; (if (and (= beg (point-min))
1182 (font-lock-fontify-buffer) 1212 ;; (= end (point-max)))
1183 (font-lock-fontify-region beg end))) 1213 ;; (font-lock-fontify-buffer)
1214 ;; (font-lock-fontify-region beg end)))
1215 (font-lock-fontify-region beg end))
1184 font-lock-range-table))))))) 1216 font-lock-range-table)))))))
1185 font-lock-pending-extent-table))) 1217 font-lock-pending-extent-table)))
1186 1218
1187 ;; Syntactic fontification functions. 1219 ;; Syntactic fontification functions.
1188 1220
2488 java-font-lock-keywords-2 2520 java-font-lock-keywords-2
2489 2521
2490 (list 2522 (list
2491 2523
2492 ;; Javadoc tags 2524 ;; Javadoc tags
2493 '("@\\(author\\|exception\\|throws\\|deprecated\\|param\\|return\\|see\\|since\\|version\\)\\s " 2525 '("@\\(author\\|deprecated\\|exception\\|throws\\|param\\|return\\|see\\|since\\|version\\|serial\\|serialData\\|serialField\\)\\s "
2494 0 font-lock-keyword-face t) 2526 0 font-lock-keyword-face t)
2495 2527
2496 ;; Doc tag - Parameter identifiers 2528 ;; Doc tag - Parameter identifiers
2497 (list (concat "@param\\s +" java-font-lock-identifier-regexp) 2529 (list (concat "@param\\s +" java-font-lock-identifier-regexp)
2498 1 'font-lock-variable-name-face t) 2530 1 'font-lock-variable-name-face t)