diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-02-21 10:27:27 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-02-21 10:27:27 +0100 |
| commit | c96fe562ae71ffb6390553f3f84d297f535dcf27 (patch) | |
| tree | 224badfe5e7acafe5ec9841991bedcf4f6103c2a | |
| parent | 47eaee0e285ccd6e3981b340eeabc48dadfe7a4b (diff) | |
| parent | f5a99945b6f704c1de47511343248b22a6189bab (diff) | |
| download | emacs-c96fe562ae71ffb6390553f3f84d297f535dcf27.tar.gz | |
Merge from origin/emacs-29
f5a99945b6f ; Update ChangeLog for Emacs 28.3
f7bd5ac5521 Update HISTORY for Emacs 28.3
| -rw-r--r-- | ChangeLog.3 | 32 | ||||
| -rw-r--r-- | etc/HISTORY | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 2 |
4 files changed, 35 insertions, 3 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index 45db1c71f6d..85cccf0d6ed 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1,3 +1,33 @@ +2022-02-18 Stefan Kangas <stefankangas@gmail.com> + + * Version 28.3 released. + +2023-02-17 Stefan Kangas <stefankangas@gmail.com> + + Update HISTORY for Emacs 28.3 + +2023-02-17 Stefan Kangas <stefankangas@gmail.com> + + Bump Emacs version to 28.3 + + * README: + * configure.ac: + * msdos/sed2v2.inp: + * nt/README.W32: Bump Emacs version to 28.3. + +2023-02-17 Stefan Kangas <stefankangas@gmail.com> + + Update NEWS for Emacs 28.3 + + * etc/NEWS: Update for Emacs 28.3. + +2023-02-17 Stefan Kangas <stefankangas@gmail.com> + + Update ChangeLog and AUTHORS for Emacs 28.3 + + * ChangeLog.3: + * etc/AUTHORS: Update for Emacs 28.3. + 2023-02-17 Xi Lu <lx@shellcodes.org> Fix etags local command injection vulnerability @@ -237318,7 +237348,7 @@ This file records repository revisions from commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to -commit 790ea50b8116427fecd263ae7fc44890be518048 (inclusive). +commit f7bd5ac55211ad0ae2e473f0dff46df1e60f99bf (inclusive). See ChangeLog.2 for earlier changes. ;; Local Variables: diff --git a/etc/HISTORY b/etc/HISTORY index 9e4becc946e..8b80473e321 100644 --- a/etc/HISTORY +++ b/etc/HISTORY @@ -228,6 +228,8 @@ GNU Emacs 28.1 (2022-04-04) emacs-28.1 GNU Emacs 28.2 (2022-09-12) emacs-28.2 +GNU Emacs 28.3 (2023-02-17) emacs-28.3 + ---------------------------------------------------------------------- This file is part of GNU Emacs. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 4ec21af1b25..f726fef467e 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -2105,7 +2105,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; prevent a repeat invocation. See elisp/lispref page "Search-based ;; Fontification". (while (and (< (point) limit) - (re-search-forward + (re-search-forward "\\<\\(module\\|export\\|import\\)\\>\\(?:[^_$]\\|$\\)" limit t)) (goto-char (match-end 1)) diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 61f81f09b3e..28403385115 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -3975,7 +3975,7 @@ is in effect when this is matched (see `c-identifier-syntax-table')." ;; "throw" in `c-type-modifier-kwds' is followed ;; by a parenthesis list, but no extra measures ;; are necessary to handle that. - (regexp-opt + (regexp-opt (append (c-lang-const c-fun-name-substitute-kwds) (c-lang-const c-type-modifier-kwds)) t) |