Commit da6deda8 authored by Alan Mackenzie's avatar Alan Mackenzie

Move defvars of c-doc-line-join-re + two others from cc-fonts.el to cc-mode.el

This is because these variables are needed at runtime even when cc-fonts.el
hasn't been loaded, as in XEmacs when font locking hasn't been enabled.

* lisp/progmodes/cc-fonts.el (c-doc-line-join-re)
(c-doc-bright-comment-start-re, c-doc-line-join-end-ch): Move definitions to
cc-mode.el.
parent aed6e2f7
Pipeline #2135 failed with stage
in 55 minutes and 30 seconds
...@@ -2584,18 +2584,18 @@ need for `pike-font-lock-extra-types'.") ...@@ -2584,18 +2584,18 @@ need for `pike-font-lock-extra-types'.")
;;; Doc comments. ;;; Doc comments.
(defvar c-doc-line-join-re regexp-unmatchable) (cc-bytecomp-defvar c-doc-line-join-re)
;; Matches a join of two lines in a doc comment. ;; matches a join of two lines in a doc comment.
;; This should not be changed directly, but instead set by ;; This should not be changed directly, but instead set by
;; `c-setup-doc-comment-style'. This variable is used in `c-find-decl-spots' ;; `c-setup-doc-comment-style'. This variable is used in `c-find-decl-spots'
;; in (e.g.) autodoc style comments to bridge the gap between a "@\n" at an ;; in (e.g.) autodoc style comments to bridge the gap between a "@\n" at an
;; EOL and the token following "//!" on the next line. ;; EOL and the token following "//!" on the next line.
(defvar c-doc-bright-comment-start-re regexp-unmatchable) (cc-bytecomp-defvar c-doc-bright-comment-start-re)
;; Matches the start of a "bright" comment, one whose contents may be ;; Matches the start of a "bright" comment, one whose contents may be
;; fontified by, e.g., `c-font-lock-declarations'. ;; fontified by, e.g., `c-font-lock-declarations'.
(defvar c-doc-line-join-end-ch nil) (cc-bytecomp-defvar c-doc-line-join-end-ch)
;; A list of characters, each being a last character of a doc comment marker, ;; A list of characters, each being a last character of a doc comment marker,
;; e.g. the ! from pike autodoc's "//!". ;; e.g. the ! from pike autodoc's "//!".
......
...@@ -128,6 +128,25 @@ ...@@ -128,6 +128,25 @@
; ' ; '
(require 'cc-fonts) ;) (require 'cc-fonts) ;)
;; The following three really belong to cc-fonts.el, but they are required
;; even when cc-fonts.el hasn't been loaded (this happens in XEmacs when
;; font-lock-mode is nil).
(defvar c-doc-line-join-re regexp-unmatchable)
;; Matches a join of two lines in a doc comment.
;; This should not be changed directly, but instead set by
;; `c-setup-doc-comment-style'. This variable is used in `c-find-decl-spots'
;; in (e.g.) autodoc style comments to bridge the gap between a "@\n" at an
;; EOL and the token following "//!" on the next line.
(defvar c-doc-bright-comment-start-re regexp-unmatchable)
;; Matches the start of a "bright" comment, one whose contents may be
;; fontified by, e.g., `c-font-lock-declarations'.
(defvar c-doc-line-join-end-ch nil)
;; A list of characters, each being a last character of a doc comment marker,
;; e.g. the ! from pike autodoc's "//!".
;; Other modes and packages which depend on CC Mode should do the ;; Other modes and packages which depend on CC Mode should do the
;; following to make sure everything is loaded and available for their ;; following to make sure everything is loaded and available for their
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment