]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ebce84 212e30f)
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Fri, 28 Apr 2023 16:14:26 +0000 (12:14 -0400)
committerEli Zaretskii <eliz@gnu.org>
Fri, 28 Apr 2023 16:14:26 +0000 (12:14 -0400)
commite155df7da785df732d34c9437abd24252c5be9ae
treef149e17506e6afd34fca75ca90650ae214fcce9dtree | snapshot
parent6ebce84ff2b4e488fbffaa0f7cc2b06580557bf7commit | diff
parent212e30f6789cd080a9428958872ffcaab6bf248acommit | diff
Merge from origin/emacs-29

212e30f6789 ; Fix byte-compilation warnings in c-ts-mode.el
1f2214dabd0 Skip over whitespace in annotation-top-cont check (bug#63...
7e136c51f6f Update zh-CN tutorial translation
d3ca0b3aa2e ; * lisp/progmodes/c-ts-mode.el: Fix comments and doc str...
c6f15c24862 ; Fix last change.
b9e06330f75 ; * etc/NEWS: Followup to bug#62720.
b33d25f5967 ; Minor improvements in doc strings of package-upgrade co...
c3a61870b94 Fix eglot.texi

# Conflicts:
# etc/NEWS
etc/NEWS.29 diff1 | | blob | history
lisp/emacs-lisp/package.el diff1 | diff2 | blob | history
lisp/progmodes/c-ts-mode.el diff1 | diff2 | blob | history
lisp/progmodes/csharp-mode.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.