]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorPo Lu <luangruo@yahoo.com>
Fri, 9 Dec 2022 01:31:37 +0000 (09:31 +0800)
committerPo Lu <luangruo@yahoo.com>
Fri, 9 Dec 2022 01:31:37 +0000 (09:31 +0800)
67ef92fb0e9 Revert "; * src/emacs.c (main): Improvements to last chan...
6ccdda3df2e server-eval-at: Don't call server--file-name
90895773293 ; Improve use-package Commentary sections
15dda8cd5b3 ; Don't say to require bind-key in use-package manual
26267040549 ; Normalize GPLv3 license statements in new files

1  2 
lisp/progmodes/c-ts-mode.el
lisp/progmodes/csharp-mode.el
lisp/progmodes/java-ts-mode.el
lisp/progmodes/json-ts-mode.el
lisp/progmodes/typescript-ts-mode.el
lisp/server.el
lisp/use-package/bind-key.el

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/server.el
Simple merge
Simple merge