diff options
| author | Alan Mackenzie | 2020-06-09 16:58:52 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2020-06-09 16:58:52 +0000 |
| commit | 5a6e790247ca8f0964ee8acd6dc6c564daaf6077 (patch) | |
| tree | 2116f3a8bd403f5f481fd4f9e952600e21057641 | |
| parent | 4b21759b6f06f4560e5c8d7e4c52ce5c55393957 (diff) | |
| download | emacs-5a6e790247ca8f0964ee8acd6dc6c564daaf6077.tar.gz emacs-5a6e790247ca8f0964ee8acd6dc6c564daaf6077.zip | |
Orthographical amendments to commit 145aab0672ae259736ee9230f8e0ff4effa5f4fd
* etc/NEWS: Correct the spelling of CC Mode.
* lisp/progmodes/cc-fonts.el (doxygen-font-lock-doc-comments): Replace curly
quotes in comments by ASCII ones.
| -rw-r--r-- | etc/NEWS | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 18 |
2 files changed, 10 insertions, 10 deletions
| @@ -333,7 +333,7 @@ prefix on the Subject line in various languages. | |||
| 333 | These new navigation commands are bound to 'n' and 'p' in | 333 | These new navigation commands are bound to 'n' and 'p' in |
| 334 | 'apropos-mode'. | 334 | 'apropos-mode'. |
| 335 | 335 | ||
| 336 | ** CC mode | 336 | ** CC Mode |
| 337 | 337 | ||
| 338 | *** Added support for Doxygen documentation style. | 338 | *** Added support for Doxygen documentation style. |
| 339 | 'doxygen' is now a valid 'c-doc-comment-style' which recognises all | 339 | 'doxygen' is now a valid 'c-doc-comment-style' which recognises all |
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 9ea08a46244..386cc2f16fe 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el | |||
| @@ -3024,18 +3024,18 @@ need for `pike-font-lock-extra-types'.") | |||
| 3024 | ;; needed to do that efficiently. | 3024 | ;; needed to do that efficiently. |
| 3025 | `((,(concat | 3025 | `((,(concat |
| 3026 | ;; Make sure that the special character has not been escaped. E.g. in | 3026 | ;; Make sure that the special character has not been escaped. E.g. in |
| 3027 | ;; ‘\@foo’ only ‘\@’ is a command (similarly for other characters like | 3027 | ;; `\@foo' only `\@' is a command (similarly for other characters like |
| 3028 | ;; ‘\\foo’, ‘\<foo’ and ‘\&foo’). The downside now is that we don’t | 3028 | ;; `\\foo', `\<foo' and `\&foo'). The downside now is that we don't |
| 3029 | ;; match command started just after an escaped character, e.g. in | 3029 | ;; match command started just after an escaped character, e.g. in |
| 3030 | ;; ‘\@\foo’ we should match ‘\@’ as well as ‘\foo’ but only the former | 3030 | ;; `\@\foo' we should match `\@' as well as `\foo' but only the former |
| 3031 | ;; is matched. | 3031 | ;; is matched. |
| 3032 | "\\(?:^\\|[^\\@]\\)\\(" | 3032 | "\\(?:^\\|[^\\@]\\)\\(" |
| 3033 | ;; Doxygen commands start with backslash or an at sign. Note that for | 3033 | ;; Doxygen commands start with backslash or an at sign. Note that for |
| 3034 | ;; brevity in the comments only ‘\’ will be mentioned. | 3034 | ;; brevity in the comments only `\' will be mentioned. |
| 3035 | "[\\@]\\(?:" | 3035 | "[\\@]\\(?:" |
| 3036 | ;; Doxygen commands except those starting with ‘f’ | 3036 | ;; Doxygen commands except those starting with `f' |
| 3037 | "[a-eg-z][a-z]*" | 3037 | "[a-eg-z][a-z]*" |
| 3038 | ;; Doxygen command starting with ‘f’: | 3038 | ;; Doxygen command starting with `f': |
| 3039 | "\\|f\\(?:" | 3039 | "\\|f\\(?:" |
| 3040 | "[][$}]" ; \f$ \f} \f[ \f] | 3040 | "[][$}]" ; \f$ \f} \f[ \f] |
| 3041 | "\\|{\\(?:[a-zA-Z]+\\*?}{?\\)?" ; \f{ \f{env} \f{env}{ | 3041 | "\\|{\\(?:[a-zA-Z]+\\*?}{?\\)?" ; \f{ \f{env} \f{env}{ |
| @@ -3062,8 +3062,8 @@ need for `pike-font-lock-extra-types'.") | |||
| 3062 | ;; Autolinking. Doxygen auto-links anything that is a class name but we have | 3062 | ;; Autolinking. Doxygen auto-links anything that is a class name but we have |
| 3063 | ;; no hope of matching those. We are, however, able to match functions and | 3063 | ;; no hope of matching those. We are, however, able to match functions and |
| 3064 | ;; members using explicit scoped syntax. For functions, we can also find | 3064 | ;; members using explicit scoped syntax. For functions, we can also find |
| 3065 | ;; them by noticing argument-list. Note that Doxygen accepts ‘::’ as well | 3065 | ;; them by noticing argument-list. Note that Doxygen accepts `::' as well |
| 3066 | ;; as ‘#’ as scope operators. | 3066 | ;; as `#' as scope operators. |
| 3067 | (,(let* ((ref "[\\@]ref\\s-+") | 3067 | (,(let* ((ref "[\\@]ref\\s-+") |
| 3068 | (ref-opt (concat "\\(?:" ref "\\)?")) | 3068 | (ref-opt (concat "\\(?:" ref "\\)?")) |
| 3069 | (id "[a-zA-Z_][a-zA-Z_0-9]*") | 3069 | (id "[a-zA-Z_][a-zA-Z_0-9]*") |
| @@ -3079,7 +3079,7 @@ need for `pike-font-lock-extra-types'.") | |||
| 3079 | "\\)")) | 3079 | "\\)")) |
| 3080 | 1 font-lock-function-name-face prepend nil) | 3080 | 1 font-lock-function-name-face prepend nil) |
| 3081 | ;; Match URLs and emails. This has two purposes. First of all, Doxygen | 3081 | ;; Match URLs and emails. This has two purposes. First of all, Doxygen |
| 3082 | ;; autolinks URLs. Second of all, ‘@bar’ in ‘foo@bar.baz’ has been matched | 3082 | ;; autolinks URLs. Second of all, `@bar' in `foo@bar.baz' has been matched |
| 3083 | ;; above as a command; try and overwrite it. | 3083 | ;; above as a command; try and overwrite it. |
| 3084 | (,(let* ((host "[A-Za-z0-9]\\(?:[A-Za-z0-9-]\\{0,61\\}[A-Za-z0-9]\\)") | 3084 | (,(let* ((host "[A-Za-z0-9]\\(?:[A-Za-z0-9-]\\{0,61\\}[A-Za-z0-9]\\)") |
| 3085 | (fqdn (concat "\\(?:" host "\\.\\)+" host)) | 3085 | (fqdn (concat "\\(?:" host "\\.\\)+" host)) |