procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
f5a99945b6 ; Update ChangeLog for Emacs 28.3
f7bd5ac552 Update HISTORY for Emacs 28.3

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Kangas 2023-02-19 17:37:59 +01:00
commit 9a6f22fd0b
5 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ChangeLog.3
View file

@ -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:

2
etc/HISTORY
View file

@ -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.

2
lisp/emacs-lisp/cconv.el
View file

@ -891,7 +891,7 @@ Returns a pair (LEXV . DYNV) of those vars actually used by FORM."
(pcase expanded-form
(`#'(lambda . ,cdr) cdr)
(_ (cdr fun))))
(dynvars (delq nil (mapcar (lambda (b) (if (symbolp b) b)) env)))
(fvs (cconv-fv expanded-form lexvars dynvars))
(newenv (nconc (mapcar (lambda (fv) (assq fv env)) (car fvs))

2
lisp/progmodes/cc-fonts.el
View file

@ -2070,7 +2070,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))

2
lisp/progmodes/cc-langs.el
View file

@ -3964,7 +3964,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)