]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Mon, 23 Jan 2023 01:09:15 +0000 (02:09 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Mon, 23 Jan 2023 01:09:15 +0000 (02:09 +0100)
commit9c8e82484ab6744b9d3540895d9dc8b6929439e5
tree3d9bd82cda2099e6bac5812c685c4edd9bdd191a
parentb767a641c8fb1f06326de4598ef717014c16a334
parentb3814b43f6017d48bde2ddd12821e83948ee19dc
Merge from origin/emacs-29

b3814b43f60 (ruby-ts--predefined-variables): Fix the $` and $' entries
db02cbdfe02 * lisp/find-dired.el (find-dired-with-command): Quote fin...
2343a067c3d Generalize vc-pull-and-push to support more backends (bug...
846838dbab8 Add test suite for sgml-html-meta-auto-coding-function
0fb90f524db Fix decoding HTML files from archives
c854ef7a187 ; Fix last change (bug#60556).
8e83604dfe0 Avoid crashes in batch Emacs sub-processes on MS-Windows
808e101fabe Tweak BSD style indentation (bug#60984)
204519a2e73 Fix typo of exposed symbol name
9296e0c6495 Fix typo after move to common lib (bug#61001)
e74ba72a6a3 ruby-ts-mode: Fix two additional cases with ruby-method-c...
ae7e28a4372 ruby-mode.el: Expand some docstrings with examples
89cb3c3f157 Minor fixes for Haiku
6adc193ad66 Move c-like common utils into own library (bug#60961)

# Conflicts:
# lisp/progmodes/typescript-ts-mode.el
lisp/frame.el
lisp/progmodes/c-ts-mode.el
lisp/progmodes/csharp-mode.el
lisp/progmodes/java-ts-mode.el
lisp/progmodes/js.el
lisp/progmodes/ruby-ts-mode.el
lisp/progmodes/typescript-ts-mode.el
lisp/simple.el
lisp/vc/vc-git.el
lisp/vc/vc.el