]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sun, 10 Dec 2023 15:35:54 +0000 (10:35 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sun, 10 Dec 2023 15:35:54 +0000 (10:35 -0500)
2773cf9e013 ; Fix typos
020aff95fa3 ; Fix typos in ChangeLog files
5e03a621efc ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--else-heuristi...
f0734e1c0d1 Fix c-ts-mode indent heuristic (bug#67417)
08fc6bace20 Fix c-ts-mode indentation (bug#67357)
71bc2815ccd Add font-locking for hash-bang lines in typescript-ts-mode.
db8347c8c87 Add font-locking for hash-bang lines in js-ts-mode
91f2ade57bb ruby-mode: Better detect regexp vs division (bug#67569)

17 files changed:
1  2 
ChangeLog.3
ChangeLog.4
doc/emacs/ChangeLog.1
doc/misc/ChangeLog.1
doc/misc/modus-themes.org
lisp/ChangeLog.13
lisp/ChangeLog.14
lisp/ChangeLog.15
lisp/ChangeLog.16
lisp/ChangeLog.17
lisp/ChangeLog.7
lisp/progmodes/c-ts-mode.el
lisp/progmodes/js.el
lisp/progmodes/ruby-mode.el
lisp/progmodes/typescript-ts-mode.el
src/ChangeLog.11
src/pgtkterm.c

diff --cc ChangeLog.3
Simple merge
diff --cc ChangeLog.4
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/pgtkterm.c
Simple merge