summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-fonts.el
Commit message (Collapse)AuthorAgeFilesLines
* ; Add 2024 to copyright yearsPo Lu2024-01-021-1/+1
|
* C Mode: Don't fontify foo globally as type due to "struct foo"Alan Mackenzie2023-07-011-1/+1
| | | | | | | This fixes bug#64322. * lisp/progmodes/cc-langs.el (c-typeless-decl-kwds): Make the entry for c-mode nil.
* Merge from origin/emacs-28Stefan Kangas2023-02-191-1/+1
|\ | | | | | | | | | | | | | | f5a99945b6f ; Update ChangeLog for Emacs 28.3 f7bd5ac5521 Update HISTORY for Emacs 28.3 # Conflicts: # etc/NEWS
* | ; Avoid byte-compiler warning in cc-fonts.el.Eli Zaretskii2023-01-181-0/+2
| |
* | CC Mode: On removal of "typedef", remove pertinent types from c-found-typesAlan Mackenzie2023-01-171-14/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For this purpose, record the type names declared by typedef in a text property, c-typedef, on the typedef. On any change to that "typedef" or a type, remove the old identifier(s) from c-found-types. This should fix bug #59671. * lisp/progmodes/cc-defs.el (c-search-forward-non-nil-char-property): New macro. * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): Move the scope of identifier-start from the "inner" let form to the outer one. Amend the return value such that the middle element of the second element is now the position of the "typedef", not merely non-nil. * lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Disregard the LIMIT parameter when fontifying the declarators of a typedef construct. Also in this case, set the c-typedef text property on the "typedef" to the list of declared types. Amend this list when these declared types change. (c-font-lock-single-decl): Massage the `types' argument given to c-font-lock-declarators. (c-font-lock-cut-off-declarators): Amend to work when the starting point of the fontification is inside a brace block. * lisp/progmodes/cc-mode.el (c-before-change-de-typedef) (c-after-change-de-typedef): New functions. (c-update-new-id): Replace the erroneous c-end-of-current-token with a clause containing c-forward-token-2. (c-before-change): Call c-before-change-de-typedef. (c-after-change): Call c-after-change-de-typedef.
* | CC Mode: partially revert commit from 2022-10-04Alan Mackenzie2023-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | This reversion is of an ill-advised optimization, which resulted in non-type identifiers getting fontified as types. * lisp/progmodes/cc-fonts.el (c-fontify-new-found-type): Rather than writing the expected face directly to the text, instead remove the `fontified' property. This allows the full font-lock mechanism to fontify the buffer correctly.
* | ; Add 2023 to copyright years.Eli Zaretskii2023-01-011-1/+1
| |
* | c-get-fontification-context: Refine the last non-default arm of the condAlan Mackenzie2022-10-291-122/+133
| | | | | | | | | | | | | | | | | | | | This fixes bug #58772. * lisp/progmodes/cc-fonts.el (c-get-fontification-context): Make the function return (decl . nil) when MATCH-POS is in the second paren list of something like DEFUN (..) (..). Tidy up untidy code with save-excursion's for greater accuracy. Set a c-type text property value c-decl-arg-start to speed up future calls. Reindent the entire function.
* | CC Mode: Fontify cast types without adding them to c-found-typesAlan Mackenzie2022-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-engine.el (c-forward-type): Test for the special new value `just-one' of c-promote-possible-types, and if found, fontify the type, but don't add it to c-found-types. (c-forward-decl-or-cast-1): Add the new &optional parameter inside-macro. Whilst checking for a cast construct, analyze the text following the closing paren more rigorously. Check for, and allow, the closing paren of a macro arglist before the putative cast construct. * lisp/progmodes/cc-fonts.el (c-font-lock-declarations): In the lambda function, pass the parameter inside-macro to c-forward-decl-or-cast-1. * lisp/progmodes/cc-langs.el (c-primary-expr-regexp-details): New c-lang-defvar which calculates `c-primary-expr-regexp' and three match numbers for various sub-expressions in the regexp. (c-primary-expr-regexp): Now extracted from `c-primary-expr-regexp-details'. (c-per-++---match, c-per-&*+--match, c-per-\(-match): New c-lang-defconsts/vars extracted from `c-primary-expr-regexp-details'.
* | Test face name variables are bound before using them in cc-fonts.elAlan Mackenzie2022-10-251-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #58641. Also, set c-reference-face-name to font-lock-constant face in preference to c-label-face-name. * lisp/progmodes/cc-fonts.el (c-preprocessor-face-name, c-label-face-name) (c-constant-face-name, c-reference-face-name): Test variables with the same name as font-lock faces are bound before accessing their values. (c-reference-face-name): Use font-lock-constant face in preference to c-label-face-name.
* | CC Mode: Cease adding types to found-types too eagerlyAlan Mackenzie2022-10-191-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #58537 and bug #58539. * lisp/progmodes/cc-engine.el (c-forward-type): Remove trailing whitespace from an identifier before passing it to c-add-type. (c-forward-decl-or-cast-1): CASE 3: Do not recognize two consecutive identifiers as type + variable/function unless certain conditions are met. CASE 10: Do not recognize the "type" as a found type unless certain condtions are met. (Near end): Do not recognize the identifier in a cast as a type unless certain conditions are met. * lisp/progmodes/cc-fonts.el (c-get-fontification-context): Recognize being in declaration parens when there is a syntactially wrong "foo ((bar))" preceding the match position. * lisp/progmodes/cc-mode.el (c-update-new-id): Set c-new-id-is-type unconditionally to nil to prevent a second identifier being wrongly marked as a type.
* | Correctly fontify C++'s operator"" _tag (...)Alan Mackenzie2022-10-141-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give both the "" and _tag font-lock-function-name-face. Also correct the fontification of an inherited class name when there is an attribute between the class name being declared and the colon introducing the inheritance. * lisp/progmodes/cc-engine.el (c-forward-over-colon-type-list): New function. (c-forward-keyword-clause): Use the above new function instead of a looking-at. (c-forward-name, c-forward-declarator): Accept both the "" and the tag as part of the name. * lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Fontify the "" (which already has font-lock-string-face) and the tag with font-lock-function-name-face. * lisp/progmodes/cc-langs.el (c-overloadable-operators): Add "" to this list. (c-sub-colon-type-list-re): New lang-const and lang-var.
* | CC Mode: Optimize c-fontify-new-found-type and amend a debug specAlan Mackenzie2022-10-041-2/+6
| | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-fonts.el (c-fontify-new-found-type): Write the `face' property directly, rather than removing `fontified' properties and letting font-lock do the work. * lisp/progmodes/cc-defs.el (cc-eval-when-compile): Amend the debug spec from t to (&rest body), in line with the fix to bug #16184.
* | CC Mode: Refactor c-forward-delarator and callersAlan Mackenzie2022-09-291-27/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c-forward-declarator now moves over a complete declarator, including any arglist expression, but possibly not including certain C++20 constructs. * lisp/progmodes/cc-engine.el (c-forward-decl-arglist): New function, extracted from c-do-declarators. (c-forward-declarator): Extend the result list by one element, denoting whether the function parsed an argument list. Insert special handling for a C++ operator<op> construct. If there is a parenthesis expression, and it is an argument list, move forward over it. (c-do-declarators): Append an optional parameter, cdd-anon-accepted instructing the function to handle declarators without identifiers. Extract c-forward-decl-arglist. * lisp/progmodes/cc-fonts.el (c-font-lock-declarators): New &optional parameter accept-anon, as above. Analyze and use the identifier location returned by c-do-declarators, rather than using c-last-identifier-range. (c-font-lock-single-decl): Determine accept-anon from the context, passing it as argument to c-font-lock-declarators. * lisp/progmodes/cc-langs.el (c-opt-identifier-prefix-key): Make a c-lang-defvar out of this existing c-lang-defconst. * lisp/progmodes/cc-mode.el (c-fl-decl-end): Adapt for the new c-forward-declarator which now moves over arglists. Amend better to handle certain syntactically invalid constructs in C++.
* | ; Fix typos (prefer American spelling)Stefan Kangas2022-09-291-1/+1
| |
* | CC Mode: Handle C++20 conceptsAlan Mackenzie2022-09-261-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-align.el (c-lineup-topmost-intro-cont): Amend so as not to indent lines following a requires line. * lisp/progmodes/cc-engine.el (c-forward-primary-expression) (c-forward-c++-requires-clause): New functions. (c-forward-declarator): Skip forward over any trailing requires clause. (c-forward-decl-or-cast-1): Skip requires clauses before and after the type. Amend the second element of the return list to include information on two consecutive identifiers in <...>. (c-looking-at-or-maybe-in-bracelist): Don't recognize braces in requires expressions as brace lists. (c-guess-basic-syntax): CASE 5D.7: New case to handle the continuation of a "concept foo = " line. * lisp/progmodes/cc-fonts.el (c-basic-matchers-before): Add a new clause to handle the declaration of a concept. (c-get-fontification-context): Treat the arglist of a requires construct as a declaration arglist. * lisp/progmodes/cc-langs.el (c-equals-nontype-decl-kwds/key) (c-fun-name-substitute-kwds/key, c-pre-concept-<>-kwds/key): New c-lang-consts/vars. (c-constant-key): New c-lang-var. (c-type-decl-suffix-key): Include "requires" in the keywords matched. * lisp/progmodes/cc-mode.el (c-fl-decl-start): Fix an off by one error. Use equal rather than eq to compare two syntax contexts.
* | cc-fonts.el: Eliminate an Emacs compiler warning introduced yesterday.Alan Mackenzie2022-09-161-3/+4
| | | | | | | | | | * lisp/progmodes/cc-fonts.el (top level): Introduce a cc-bytecomp-defvar for font-lock-reference-face.
* | CC Mode: Handle C++20 modulesAlan Mackenzie2022-09-151-4/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-engine.el (c-before-after-change-check-c++-modules): New function. (c-forward-<>-arglist): Add special handling for "import <...>". * lisp/progmodes/cc-fonts.el (c-preprocessor-face-name): Add extra "fallback" face after font-lock-reference-face, namely font-lock-constant-face. (c-cpp-matchers): Don't fontify the <> delimiters for XEmacs in #include <..>. (c-basic-matchers-before): Add c-font-lock-c++-modules to the C++ value. (c-forward-c++-module-name, c-forward-c++-module-partition-name) (c-font-lock-c++-modules): New functions. * lisp/progmodes/cc-langs.el (c-get-state-before-change-functions) (c-before-font-lock-functions): Include c-before-after-change-check-c++-modules in the C++ value of these variables. (c-module-name-re): New c-lang-const/var. (c-other-decl-kwds): Add a C++ value "export". (c-<>-sexp-kwds): Add a new component c-import-<>-kwds. (c-import-<>-kwds, c-module-kwds): New c-lang-consts. (c-module-key): New c-lang-const/var.
* | C++ Mode: Fontify functions correctly with commas in template expressionsAlan Mackenzie2022-08-311-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #57318. Also apply an optimization which marks generic expressions as already analyzed, thus avoiding repeating this analysis when not needed. This optimization prevents the fix slowing down scrolling when the C++ source has lots of template structures. * lisp/progmodes/cc-engine.el (top-level) Near the beginning of the file, add a comment describing the new text property c-<>-c-types-set. (c-update-brace-stack): Bind c-restricted-<>-arglists to nil rather than t around the call to c-forward-<>-arglist. (c-forward-<>-arglist-recur): Allow the abbreviated analysis of a generic expression also when the opening < is marked with a c-<>-c-types-set text property. Set this property at the same time as the c-type properties are set on the commas inside the template structure. * lisp/progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare): Clear the c-<>-c-types-set text property, along with c-type, from the region being fontified.
* | C++ Mode - Fontify "class Foo {\n ~Foo() noexcept;" correctlyAlan Mackenzie2022-08-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #49787. * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): (In `if' form just before CASE 8) Remove the (not ...) around the (looking-at c-after-suffixed-type-maybe-decl-key). * lisp/progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare): Add `c-not-decl' to the values of c-type which are erased at the start of a fontification.
* | CC Mode: Optimize font-locking stanzas for long raw strings.Alan Mackenzie2022-08-061-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also replace some regexp searches which had caused regexp engine stack overflows with simple end-of-line calls. * lisp/progmodes/cc-fonts.el (c-make-syntactic-matcher) (c-make-font-lock-search-form): Start the generated functions with a skipping of comments and strings. (c-make-font-lock-BO-decl-search-function): Start the generated function with a (fast) movement to the start of any literal. * lisp/progmodes/cc-mode.el (c-before-change-check-unbalanced-strings) (c-after-change-mark-abnormal-strings): Replace complicated regexp searches for end of logical line with basic Lisp functions.
* | Merge from origin/emacs-28Stefan Kangas2022-07-031-10/+13
|\| | | | | | | | | | | | | dc3d01a5af CC Mode: Fix a c-backward-token-2 call wrongly jumping bac... e390396e68 Doc fixes; don't use obsolete names c85f7c2e8a Don't refer to obsolete alias for insert-char 60ad45c5d2 Don't use obsolete face name in manoj-dark-theme
| * CC Mode: Fix a c-backward-token-2 call wrongly jumping back over macros.Alan Mackenzie2022-07-021-10/+13
| | | | | | | | | | | | | | | | This fixes bug #56256. * lisp/progmodes/cc-fonts.el (c-font-lock-c++-lambda-captures): Replace a c-backward-token-2, which could jump back too far leading to an infinite loop, with a save-excursion to remember the point we've got to go back to.
* | Note current buffer and restore it in c-force-redisplay.Alan Mackenzie2022-02-101-4/+6
| | | | | | | | | | | | | | | | | | This fixes bug #52709. * lisp/progmodes/cc-fonts.el (c-force-redisplay): New parameter BUFFER. Set current buffer to this before fontifying. (c-fontify-new-found-type): Give the current buffer as argument to run-with-timer.
* | Merge from origin/emacs-28Eli Zaretskii2022-01-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4
| * ; Add 2022 to copyright years.Eli Zaretskii2022-01-011-1/+1
| |
* | CC Mode: Remove annoying background fontification. Should fix bug #52298Alan Mackenzie2021-12-191-173/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert the commits from 2021-10-24 - 2021-10-26, "CC Mode: Fontify "found types" which are recognized after being first scanned". This removes the background fontification which ran off of a 0.1s timer, but leaves the facility of normal fontification causing the fontification throughout the buffer of newly found types. * lisp/progmodes/cc-fonts.el (c-find-types-background) (c-type-finder-timer-func): Remove. * lisp/progmodes/cc-mode.el (c-type-finder-timer, c-inhibit-type-finder) (c-type-finder-pos, c-post-gc-hook): Remove. (c-leave-cc-mode-mode): Remove the manipulations of c-type-finder-timer and c-post-gc-hook. (c-basic-common-init): Remove the manipulations of c-type-finder-pos, c-type-finder-timer, and c-post-gc-hook. * lisp/progmodes/cc-vars.el (c-type-finder-time-slot) (c-type-finder-repeat-time, c-type-finder-chunk-size): Remove. * doc/misc/cc-mode.texi (Found Types): Remove. Amend some menu entries.
* | C++ Mode: Fix incoorect background fontification of <Alan Mackenzie2021-11-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where c-record-found-types gets "bound" to itself, we postpone the calling of c-fontify-new-type on possible new found types until these are confirmed by the return from the function tentatively finding these types, for exmaple c-forward-<>-arglist. We check this "binding" by testing the value of c-record-found-types. Correct the background fontification algorithm. * lisp/progmodes/cc-engine.el (c-record-found-types): Move the definition to earlier in the file. (c-add-type-1): Check additionally c-record-found-types is nil before calling c-fontify-new-found-type. (c-forward-<>-arglist, c-forward-type): On return from a function which collects found types in c-record-found-types, call c-fontify-new-found-types for each such type. * lisp/progmodes/c-fonts.el (c-force-redisplay): Actually fontify the new found type. (c-fontify-new-found-type): Test for font-lock-mode being enabled. Remove the spurious condition on the `fontified' text property being nil before causing c-force-redisplay to get called.
* | CC Mode: Fontify "found types" which are recognized after being first scannedAlan Mackenzie2021-10-241-7/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aims to fix the scenario where on jit-lock's first scan of a type, it is not recognized as such, and only later does this happen. The fontification of such found types is now done by background scanning in short time slices immediately after initialising the mode. * lisp/progmodes/cc-engine.el (c-add-type-1): New function. (c-add-type): Extract c-add-type-1 from it, and reformulate the mechanism for protecting c-found-types from excessive partial identifiers. * lisp/progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare): Remove the code which cleared c-found-types on fontification at BOB. (c-find-types-background): New function, based on c-font-lock-declarations). (c-type-finder-timer-func): New function. (c-re-redisplay-timer): New variable. (c-force-redisplay, c-fontify-new-found-type): New functions. * lisp/progmodes/cc-mode.el (c-type-finder-timer, c-inhibit-type-finder): New variables. (c-leave-cc-mode-mode): Nullify c-post-command-hook, c-post-gc-hook, and c-type-finder-timer when the last CC Mode buffer of a session is killed. (c-type-finder-pos): New variable. (c-basic-common-init): Initialize/Install c-post-command, c-c-type-finder-pos, c-type-finder-timer, and c-post-gc-hook. (c-new-id-start, c-new-id-end, c-new-id-is-type): New variables. (c-update-new-id): New function. (c-post-command): New post command hook function, used for checking moving away from partially typed identifiers, and making them full identifiers. (c-post-gc-hook): New hook to prevent CC Mode activity immediately following GC, thus allowing keyboard/mouse input to be registered. (c-before-change): Add code to clear c-found-types on a buffer change at BOB. (c-after-change): Call c-update-new-id to keep track of partially typed identifiers. * doc/misc/cc-mode.texi (Found Types): New @section in the @Chapter Font Locking. * lisp/progmodes/cc-vars.el (c-type-finder-time-slot) (c-type-finder-repeat-time, c-type-finder-chunk-size): New customizable options.
* | Revert "CC Mode: Fontify "found types" which are recognized after being ..."Alan Mackenzie2021-10-231-194/+7
| | | | | | | | | | This reverts commit 51719617eb19833056618ebac403cdcaf711551a. The commit caused a hang at start-up with a big desktop.
* | CC Mode: Fontify "found types" which are recognized after being first scannedAlan Mackenzie2021-10-221-7/+194
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aims to fix the scenario where on jit-lock's first scan of a type, it is not recognized as such, and only later does this happen. The fontification of such found types is now done by background scanning in short time slices immediately after initialising the mode. * lisp/progmodes/cc-engine.el (c-add-type-1): New function. (c-add-type): Extract c-add-type-1 from it, and reformulate the mechanism for protecting c-found-types from excessive partial identifiers. * lisp/progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare): Remove the code which cleared c-found-types on fontification at BOB. (c-find-types-background): New function, based on c-font-lock-declarations). (c-types-finder-timer-func): New function. (c-re-redisplay-timer): New variable. (c-force-redisplay, c-fontify-new-found-type): New functions. * lisp/progmodes/cc-mode.el (c-type-finder-timer): New variable. (c-leave-cc-mode-mode): Nullify c-post-command-hook and c-type-finder-timer when the last CC Mode buffer of a session is killed. (c-type-finder-pos): New variable. (c-basic-common-init): Initialize c-type-finder-pos and c-type-finder-timer. (c-new-id-start, c-new-id-end, c-new-id-is-type): New variables. (c-update-new-id): New function. (c-post-command): New post command hook function, used for checking moving away from partially typed identifiers, and making them full identifiers. (c-before-change): Add code to clear c-found-types on a buffer change at BOB. (c-after-change): Call c-update-new-id to keep track of partially typed identifiers. * doc/misc/cc-mode.texi (Found Types): New @section in the @Chapter Font Locking. * lisp/progmodes/cc-vars.el (c-type-finder-time-slot) (c-type-finder-repeat-time, c-type-finder-chunk-size): New customizable options.
* ; More minor stylistic fixes found by checkdocStefan Kangas2021-09-221-1/+1
|
* Merge from origin/emacs-27Glenn Morris2021-08-161-6/+9
|\ | | | | | | | | | | | | | | 9664ee182c (origin/emacs-27) C++ Mode: Don't confuse the pointer oper... b3aec9ee48 CC Mode: Fix unstable fontification of doc strings. # Conflicts: # lisp/progmodes/cc-fonts.el
| * CC Mode: Fix unstable fontification of doc strings.Alan Mackenzie2021-08-151-6/+9
| | | | | | | | | | | | | | | | | | Also optimize a loop over several line doc-comments. * lisp/progmodes/cc-fonts.el (c-font-lock-doc-comments): New variable comment-mid, used as the starting point for applying c-doc-face-name in a line comments. In block comments, apply this face not from `comment-beg' but from `region-beg', no earlier than the start of the fontification region.
| * Update copyright year to 2021Paul Eggert2021-01-011-1/+1
| | | | | | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* | CC Mode: Enhance C++ Mode raw strings to multi-line strings for any languageAlan Mackenzie2021-08-121-49/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-defs.el (cadar, caddr, cdddr): Add defsubsts for these for when they are missing from the host Emacs. (c-point): Add new `position' 'boll "beginning of logical line". (c-clear-char-properties): Return the position of the lowest removed property. * lisp/progmodes/cc-engine.el (c-full-pp-to-literal): Fix for rare case where LIMIT < START in parse-partial-sexp. (c-old-beg-rs, c-old-end-rs, c-raw-string-end-delim-disrupted) (c-raw-string-pos, c-raw-string-in-end-delim, c-depropertize-raw-string) (c-depropertize-raw-strings-in-region, c-before-change-check-raw-strings) (c-propertize-raw-string-id, c-propertize-raw-string-opener): Old functions and variables removed or renamed "raw" -> "ml" and adapted. (c-old-beg-ml, c-old-1-beg-ml, c-old-end-ml, c-beg-pos, c-end-pos) (c-ml-string-end-delim-disrupted, c-depropertize-ml-string-delims) (c-ml-string-delims-around-point,c-position-wrt-ml-delims) (c-before-change-check-ml-strings, c-after-change-unmark-ml-strings) (c-maybe-re-mark-ml-string, c-propertize-ml-string-id) (c-propertize-ml-string-opener, c-depropertize-ml-string) (c-depropertize-ml-strings-in-region): New functions and variables adapted and possibly renamed from "raw" -> "ml". (c-ml-string-make-closer-re, c-ml-string-make-opener-re) (c-c++-make-ml-string-closer-re, c-c++-make-ml-string-opener-re) (c-get-ml-closer, c-ml-string-opener-around-point) (c-ml-string-opener-intersects-region, c-ml-string-opener-at-or-around-point) (c-ml-string-back-to-neutral, c-ml-string-in-end-delim, c-neutralize-pos) (c-neutralized-prop): New functions and variables. * lisp/progmodes/cc-fonts.el (c-basic-matchers-before): Replace c-font-lock-raw-strings with c-font-lock-ml-strings. (c-font-lock-ml-strings): New function taking the place of the old c-font-lock-ml-strings. * lisp/progmodes/cc-langs.el (c-get-state-before-change-functions): Move c-depropertize-CPP to the second item of the C++ entry, and replace c-before-change-check-raw-strings by c-before-change-check-ml-strings. Add a new entry for Pike Mode. (c-before-font-lock-functions): (Replace c-after-change-unmark-raw-strings by c-after-change-unmark-ml-strings in the C++ entry, and add a new entry for Pike Mode. (c-ml-string-backslash-escapes, c-ml-string-non-punc-skip-chars) (c-ml-string-opener-re, c-ml-string-max-opener-len, c-ml-string-any-closer-re) (c-ml-string-max-closer-len, c-ml-string-max-closer-len-no-leader) (c-ml-string-back-closer-re, c-make-ml-string-closer-re-function) (c-make-ml-string-opener-re-function, c-ml-string-cpp-or-opener-re) (c-cpp-or-ml-match-offset): New c-lang-defconsts and c-land-defvars. (c-multiline-string-start-char): Remove the Pike Mode setting. * lisp/progmodes/cc-mode.el (c-depropertize-CPP): Test for general ml strings rather than C++ raw strings. (c-unescaped-nls-in-string-p): Handle languages with ml strings. (c-clear-string-fences): Fix bug with wrong parenthesisation. (c-before-change-check-unbalanced-strings) (c-after-change-mark-abnormal-strings, c-after-change-escape-NL-in-string): Adapt for multi-line strings.
* | CC Mode: Get proper search limits in c-font-lock-cut-off-declaratorsAlan Mackenzie2021-04-251-3/+1
| | | | | | | | | | | | | | * lisp/progmodes/cc-fonts.el (c-font-lock-cut-off-declarators): Instead of using a crude 2,000 characters back limit for backward searching, which is erroneous when that point is in a literal, use the already calculated c-determine-limit result.
* | CC Mode: Put debug specs inside declare forms. Add missing debug specs.Alan Mackenzie2021-04-151-17/+8
| | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-bytecomp.el, lisp/progmodes/cc-cmds.el, lisp/progmodes/cc-defs.el, lisp/progmodes/cc-engine.el, lisp/progmodes/cc-fonts.el, lisp/progmodes/cc-langs.el, lisp/progmodes/cc-mode.el: Change the explicit def-edebug-spec for many macros into a (declare (debug ...) ..) form. Add such forms to macros which were previously lacking def-edebug-spec forms.
* | Convert CC Mode to lexical binding in EmacsAlan Mackenzie2021-04-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lisp/progmodes/cc-align.el, lisp/progmodes/cc-awk.el, lisp/progmodes/cc-bytecomp.el, lisp/progmodes/cc-cmds.el, lisp/progmodes/cc-defs.el, lisp/progmodes/cc-engine.el, lisp/progmodes/cc-fonts.el, lisp/progmodes/cc-guess.el, lisp/progmodes/cc-langs.el, lisp/progmodes/cc-menus.el, lisp/progmodes/cc-mode.el, lisp/progmodes/cc-styles.el, lisp/progmodes/cc-subword.el, lisp/progmodes/cc-vars.el: Mark these files with a `lexical-binding' setting in line 1. lisp/progmodes/cc-align.el, lisp/progmodes/cc-engine.el, lisp/progmodes/cc-vars.el (c-syntactic-context, c-syntactic-element): Declare these as special variables. lisp/progmodes/cc-bytecomp.el (cc-bytecomp-debug-msg): prefix the parameter ARGS with a _, and remove an `ignore' call. lisp/progmodes/cc-cmds.el (c-where-wrt-brace-construct): Remove `kluge-start', an unused variable. (c-while-widening-to-decl-block): Add an extra parameter, which suppresses the generation of a setting of variable `where'. (c-defun-name-and-limits): Remove variable `where' from the function and use the new argument to the previous macro. lisp/progmodes/cc-engine.el (c-cache-to-parse-ps-state): Remove two unneeded variables, `last' and `intermediate'. lisp/progmodes/cc-fonts.el (c-font-lock-c++-using): Remove unused variable. lisp/progmodes/cc-langs.el (c-vsemi-status-unknown-p-fn): Replace the doc string with the more precise one from stand-alone CC Mode. lisp/progmodes/cc-styles.el (c-set-offset): Give the `ignored' parameter a leading _.
* | Update copyright year to 2021Paul Eggert2021-01-011-1/+1
| | | | | | | | Run "TZ=UTC0 admin/update-copyright".
* | CC Mode: Add newish AWK Mode facilities, as used in gawk-4.Alan Mackenzie2020-12-281-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-awk.el (c-awk-font-lock-invalid-namespace-separators): New function. (c-awk-context-expand-fl-region): New function. (awk-font-lock-keywords): Enhance handling of function declarations to include :: tokens. Fontify new system variable names FPAT, FUNCTAB, PREC, ROUNDMODE, SYNTAB. Fontify new keywords BEGINFILE and ENDFILE. Fontify new system functions asorti, dcngettext, isarray, patsplit, typeof. Fontify the new directives @include, @load, @namespace. Call c-awk-font-lock-invalid-namespace-separators as a matcher. * lisp/progmodes/cc-fonts.el (top level): No longer require 'cc-awk. * lisp/progmodes/cc-langs.el (c-before-context-fontification-functions): Give AWK the value c-awk-context-expand-fl-region rather than nil. * lisp/progmodes/cc-mode.el (top level): Declare awk-mode-syntax-table as a variable.
* | CC Mode: Optimize for scrolling large buffers containing few bracesAlan Mackenzie2020-12-151-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #25706. It particularly pertains to .h files which contain only macro definitions. Many of these files are to be found, for example, in the driver sections of the Linux kernel. * lisp/progmodes/cc-engine.el (c-beginning-of-statement-1, c-on-identifier) (c-syntactic-skip-backward, c-find-decl-prefix-search, c-find-decl-spots) (c-forward-name, c-back-over-list-of-member-inits) (c-back-over-member-initializers, c-looking-at-inexpr-block) (c-guess-basic-syntax): Give search limits to, or amend existing ones to c-backward-syntactic-ws, c-forward-syntactic-ws, c-backward-token-2, c-beginning-of-statement-1. (c-determine-limit-no-macro): New function. (c-determine-limit-get-base): Remove unlimted invocation of c-backward-syntactic-ws. (c-determine-limit): Exclude movement between two different macros. Use new function c-determine-limit-no-macro. (c-back-over-list-of-member-inits): New parameter `limit'. * lisp/progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare) (c-font-lock-declarations, c-font-lock-c++-using): Give search limits to, or amend existing ones to c-backward-syntactic-ws, c-beginning-of-decl-1. * lisp/progmodes/cc-mode.el (c-unfind-coalesced-tokens, c-before-changer) (c-fl-decl-end): Give search limits to, or amend existing ones to c-backward-syntactic-ws, c-forward-syntactic-ws, skip-chars-backward, skip-chars-forward.
* | Optimise c-font-lock-<>-arglists, particularly for buffers with few <..> pairsAlan Mackenzie2020-12-141-57/+66
| | | | | | | | | | | | | | | | | | | | * lisp/progmodes/cc-fonts.el (c-font-lock-<>-arglists): In place of a regexp search for a complicated and slow regexp, search simply for "<" ouside of literals together with add hoc testing of other requirements for a <...> match. * lisp/progmodes/cc-langs.el (c-nonsymbol-key): New c-lang-defvar from the c-lang-const.
* | C++ Mode: Modernize the fontification of "using"Alan Mackenzie2020-09-201-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "using" is now used in three distinct ways in C++, write a special function to handle these rather than attempting to adapt the old regular expressions. * lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Amend to allow the argument TYPES to be a face. This face is given to the declarator being processed. (c-font-lock-single-decl): Make an argument to c-font-lock-declarators nil or t, not merely nil or non-nil. (c-complex-decl-matchers): Include c-font-lock-c++-using in the C++ value of this variable. (c-font-lock-c++-using): New function. * lisp/progmodes/cc-langs.el (c-using-kwds, c-using-key): New lang consts/vars. (c-modifier-kwds): Remove "using" from the C++ value.
* | Orthographical amendments to commit 145aab0672ae259736ee9230f8e0ff4effa5f4fdAlan Mackenzie2020-06-091-9/+9
| | | | | | | | | | | | | | * 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.
* | cc-mode: add support for Doxygen documentation styleMichal Nazarewicz2020-05-011-0/+78
|/ | | | | | | | * lisp/progmodes/cc-fonts.el (doxygen-font-lock-doc-comments, doxygen-font-lock-keywords): New constants defining Doxygen comment style support. * lisp/progmodes/cc-vars.el (c-doc-comment-style): Updated docstring to mention now-supported Doxygen mode.
* Update copyright year to 2020Paul Eggert2020-01-011-1/+1
| | | | Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
* CC Mode. Allow fontification of "wrong" style comments with warning face.Alan Mackenzie2019-11-091-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #4192. * etc/NEWS: Add a new entry. * lisp/progmodes/cc-defs.el (c-font-lock-flush): New macro. * lisp/progmodes/cc-cmds.el (c-toggle-comment-style): On toggling the comment style, invoke c-font-lock-flush when c-mark-wrong-style-of-comment is non-nil, to cause that marking to be done instead on the other style of comment. * lisp/progmodes/cc-fonts.el (c-maybe-font-lock-wrong-style-comments): New function. (c-cpp-matchers): Call c-maybe-font-lock-wrong-style-comments when appropriate. * lisp/progmodes/cc-vars.el (c-mark-wrong-style-of-comment): New customizable option. * doc/misc/cc-mode.texi (top level, Indentation Commands, Guessing the Style, Custom Macros): For some opening quote marks, correct '' to ``. (Minor Modes): Add an xref to the new page "Wrong Comment Style" in a footnote. (Wrong Comment Style): New page.
* CC Mode. Fix slow scrolling by adding a search limit.Alan Mackenzie2019-11-021-1/+1
| | | | | | | This fixes bug #10149. * lisp/progmodes/cc-fonts.el (c-font-lock-single-decl) Limit the search by c-go-up-list-backwards to 500 non-literal characters.
* CC Mode: Stop /**/ spuriously fontifying as a doc comment under gtkdocAlan Mackenzie2019-07-271-1/+1
| | | | | | | | | | | Also fix infinite loops by correcting two regexps. * lisp/progmodes/cc-langs.el (c-last-c-comment-end-on-line-re) (c-last-open-c-comment-start-on-line-re): Correct the regexp fragments "\\*+[^/]" to "\\*+\\([^*/]\\|$\\)". * lisp/progmodes/cc-fonts.el (gtkdoc-font-lock-keywords): Disallow /**/ for doc comment fontification.
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 17:57:57 +0000