]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 48bd179 fd77de5)
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 14 Jan 2023 18:56:58 +0000 (13:56 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 14 Jan 2023 18:56:58 +0000 (13:56 -0500)
commita06c13db9eee0487975177089b44198dd08206be
tree2b34c55d5f971b81cf6763cc97a12d41e6a32250tree | snapshot
parent48bd17923a98f49a30bdce2f3a52e03fe45d63f0commit | diff
parentfd77de542d8a18e8477884839b22ef59e4000ba0commit | diff
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
etc/NEWS.29 diff1 | | blob | history
lisp/progmodes/java-ts-mode.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.