[Emacs-diffs] Changes to emacs/lisp/progmodes/cc-fonts.el

[Martin Stjernholm]

Index: emacs/lisp/progmodes/cc-fonts.el
diff -c emacs/lisp/progmodes/cc-fonts.el:1.1 
emacs/lisp/progmodes/cc-fonts.el:1.2
*** emacs/lisp/progmodes/cc-fonts.el:1.1        Thu Jul  3 08:30:59 2003
--- emacs/lisp/progmodes/cc-fonts.el    Tue Jul  8 19:21:04 2003
***************
*** 2064,2070 ****
  
      ;; Kludge: If `c-font-lock-complex-decl-prepare' is on the list we
      ;; move it first since the doc comment font lockers might add
!     ;; `c-type' text properties so they have to be cleared before that.
      (when (memq 'c-font-lock-complex-decl-prepare list)
        (setq list (cons 'c-font-lock-complex-decl-prepare
                       (delq 'c-font-lock-complex-decl-prepare
--- 2064,2070 ----
  
      ;; Kludge: If `c-font-lock-complex-decl-prepare' is on the list we
      ;; move it first since the doc comment font lockers might add
!     ;; `c-type' text properties, so they have to be cleared before that.
      (when (memq 'c-font-lock-complex-decl-prepare list)
        (setq list (cons 'c-font-lock-complex-decl-prepare
                       (delq 'c-font-lock-complex-decl-prepare
***************
*** 2642,2671 ****
                              (copy-marker (1+ start))))
        t)))
  
! (defun javadoc-font-lock-keywords ()
!   (list
!    (byte-compile
!     `(lambda (limit)
!        (c-font-lock-doc-comments "/\\*\\*" limit
!        '(("address@hidden"    ; "address@hidden ...}" markup.
!           0 ,c-doc-markup-face-name prepend nil)
!          ("^\\(/\\*\\)?[ \t*]*\\(@[a-z]+\\)" ; "@foo ..." markup.
!           2 ,c-doc-markup-face-name prepend nil)
!          (,(concat "</?\\sw"          ; HTML tags.
!                    "\\("
!                    (concat "\\sw\\|\\s \\|[=\n\r*.:]\\|"
!                            "\"[^\"]*\"\\|'[^']*'")
!                    "\\)*>")
!           0 ,c-doc-markup-face-name prepend nil)
!          ("&\\(\\sw\\|[.:]\\)+;"      ; HTML entities.
!           0 ,c-doc-markup-face-name prepend nil)
!          ;; Fontify remaining markup characters as invalid.  Note
!          ;; that the Javadoc spec is hazy about when "@" is allowed
!          ;; in non-markup use.
!          (,(lambda (limit)
!              (c-find-invalid-doc-markup "[<>&]\\|{@" limit))
!           0 ,c-invalid-face-name prepend nil)
!          ))))))
  
  (defconst autodoc-decl-keywords
    ;; Adorned regexp matching the keywords that introduce declarations
--- 2642,2671 ----
                              (copy-marker (1+ start))))
        t)))
  
! (defconst javadoc-font-lock-doc-comments
!   `(("address@hidden"         ; "address@hidden ...}" markup.
!      0 ,c-doc-markup-face-name prepend nil)
!     ("^\\(/\\*\\)?[ \t*]*\\(@[a-z]+\\)" ; "@foo ..." markup.
!      2 ,c-doc-markup-face-name prepend nil)
!     (,(concat "</?\\sw"                       ; HTML tags.
!             "\\("
!             (concat "\\sw\\|\\s \\|[=\n\r*.:]\\|"
!                     "\"[^\"]*\"\\|'[^']*'")
!             "\\)*>")
!      0 ,c-doc-markup-face-name prepend nil)
!     ("&\\(\\sw\\|[.:]\\)+;"           ; HTML entities.
!      0 ,c-doc-markup-face-name prepend nil)
!     ;; Fontify remaining markup characters as invalid.  Note
!     ;; that the Javadoc spec is hazy about when "@" is
!     ;; allowed in non-markup use.
!     (,(lambda (limit)
!       (c-find-invalid-doc-markup "[<>&]\\|{@" limit))
!      0 ,c-invalid-face-name prepend nil)))
! 
! (defconst javadoc-font-lock-keywords
!   `((,(lambda (limit)
!       (c-font-lock-doc-comments "/\\*\\*" limit
!         javadoc-font-lock-doc-comments)))))
  
  (defconst autodoc-decl-keywords
    ;; Adorned regexp matching the keywords that introduce declarations
***************
*** 2755,2760 ****
--- 2755,2771 ----
  
    nil)
  
+ (defconst autodoc-font-lock-doc-comments
+   `(("@\\(\\w+{\\|\\[\\(address@hidden|@@\\)*\\]\\|address@hidden|$\\)"
+      ;; In-text markup.
+      0 ,c-doc-markup-face-name prepend nil)
+     (autodoc-font-lock-line-markup)
+     ;; Fontify remaining markup characters as invalid.
+     (,(lambda (limit)
+       (c-find-invalid-doc-markup "@" limit))
+      0 ,c-invalid-face-name prepend nil)
+     ))
+ 
  (defun autodoc-font-lock-keywords ()
    ;; Note that we depend on that `c-current-comment-prefix' has got
    ;; its proper value here.
***************
*** 2764,2782 ****
    ;; following declarations.
    (setq c-type-decl-end-used t)
  
!   (list
!    (byte-compile
!     `(lambda (limit)
!        (c-font-lock-doc-comments "/[*/]!" limit
!        '(("@\\(\\w+{\\|\\[\\(address@hidden|@@\\)*\\]\\|address@hidden|$\\)"
!           ;; In-text markup.
!           0 ,c-doc-markup-face-name prepend nil)
!          (autodoc-font-lock-line-markup)
!          ;; Fontify remaining markup characters as invalid.
!          (,(lambda (limit)
!              (c-find-invalid-doc-markup "@" limit))
!           0 ,c-invalid-face-name prepend nil)
!          ))))))
  
  
  ;; AWK.
--- 2775,2783 ----
    ;; following declarations.
    (setq c-type-decl-end-used t)
  
!   `((,(lambda (limit)
!       (c-font-lock-doc-comments "/[*/]!" limit
!         autodoc-font-lock-doc-comments)))))
  
  
  ;; AWK.