diff options
author | Eli Zaretskii <eliz@gnu.org> | 2023-01-14 13:56:58 -0500 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2023-01-14 13:56:58 -0500 |
commit | a06c13db9eee0487975177089b44198dd08206be (patch) | |
tree | 2b34c55d5f971b81cf6763cc97a12d41e6a32250 /lisp/emacs-lisp/generate-lisp-file.el | |
parent | 48bd17923a98f49a30bdce2f3a52e03fe45d63f0 (diff) | |
parent | fd77de542d8a18e8477884839b22ef59e4000ba0 (diff) | |
download | emacs-a06c13db9eee0487975177089b44198dd08206be.tar.gz emacs-a06c13db9eee0487975177089b44198dd08206be.tar.bz2 emacs-a06c13db9eee0487975177089b44198dd08206be.zip |
Merge from origin/emacs-29
fd77de542d8 ; * etc/NEWS: Fix typos.
195afb68e31 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
cd83bc930ca ; * lisp/htmlfontify.el (hfy-exclude-file-rules): Fix :ve...
8d7ad656658 Fix indent and font-lock for annotation_type
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/emacs-lisp/generate-lisp-file.el')
0 files changed, 0 insertions, 0 deletions