6 Commits

Author	SHA1	Message	Date
Stefan Kangas	7d6f9753ad	Merge from origin/emacs-29 ... 70ecdebc92 ; Fix typos (don't abbreviate "with" or "without") a86ccb5f9d ; Fix recently added treesit documentation 2d5cf7329e ; * etc/NEWS: Fix wording and punctuation of recently adde... 61311d6862 ; Fix test failure on CI # Conflicts: # etc/NEWS	2022-12-01 16:54:53 +01:00
Stefan Kangas	cd89b81ffd	Merge from origin/emacs-29 ... 91a9598baf Update project docs and NEWS # Conflicts: # etc/NEWS	2022-12-01 16:54:50 +01:00
Eli Zaretskii	05e336278e	; * etc/NEWS.29: Resurrect Local variables that keep disappearing...	2022-12-01 17:08:02 +02:00
Po Lu	65468109a5	Merge from origin/emacs-29 ... 4161023a63 Fix crashes and memory leaks during display deinitialization 785fa80159 New user option: project-vc-extra-root-markers 7a1f1825fd Add inline to c-ts-mode--keywords 3d976d6a03 Remove duplicate "friend" from c-ts-mode--keywords 01e7d4b2a1 Make treesit-defun-prefer-top-level more flexible fb5d9ff559 Fix c-ts-mode defun movement (bug#59628) 7397f2099b * lisp/tab-bar.el: Keep tabs of the same group together (b... 832b013ef0 Insert news for installed packages only cc6efa7992 ; Fix type error in 'package-maintainers' ee32ae7c36 ; * etc/NEWS: Add missing tree-sitter based modes. 33546d6dd2 ; * etc/NEWS: Move an entry to a proper place. (bug#59718) 8617edfffd ; Fix typos # Conflicts: # etc/NEWS	2022-12-01 14:24:43 +08:00
Stefan Kangas	700a4401b7	Merge from origin/emacs-29 ... af1a99d53f Sink python indent offset guessing to avoid test failure dc0f2ec2db * etc/NEWS: Announce Org update. 0625651e8a Update to Org 9.6-3-ga4d38e edd64e64a3 Fix interactive selection of emacs-lock mode, broken by 2a... a699f65936 Fix typo in flag to load Emacs-specific LLDB commands f6aa7c335f ; Typo fixes in etc/NEWS and lisp/ files f373a23e51 CC Mode: Prevent lone ids being parsed as types unless in ... 00cb6e052a ; Improve error message when LSP server not found 7ea95d1b92 ; * doc/misc/eglot.texi (Setting Up LSP Servers): Improve ... c43cdfd639 Allow csharp-mode in c-default-style 13bb49bc0b In project-find-file, add abbreviated file names to history 4dab5f8671 * lisp/progmodes/project.el (project-vc-name): Fix the :ty... 079625d3c6 Tramp cleanup 067c65578e Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/e... 4313279e34 ; Fix typo in NEWS afc7ed987b Allow be-resources to fail 00de296d1b Simplify erc-sasl's auth-source API 83b9496a19 * doc/misc/erc.texi: Revise SASL and modules chapters. 35e2b8a26b Add erc-sasl-auth-source-function to cached options 7336520fe7 Improve fontification in csharp-ts-mode 2661c51953 Improve fontification in typescript-ts-mode bbf1b93d43 Add more font-lock settings to css-ts-mode f794263da2 Reparse tree-sitter tree when buffer restriction changes 78663ad78b ; typos # Conflicts: # etc/NEWS	2022-11-30 16:10:39 +01:00
Eli Zaretskii	65456668ab	Bump master Emacs version to 30.0.50 ... * README: * configure.ac: * nt/README.W32: * msdos/sed2v2.inp: * etc/refcards/ru-refcard.tex: Bump Emacs version to 30.0.50. * etc/NEWS.29: New file. * etc/NEWS: Empty for Emacs 30. * configure.ac: Add boilerplate for module-env-XX.h. * src/emacs-module.h.in (struct emacs_env_30): Add. * src/module-env-29.h: Remove header comment. * src/module-env-30.h: New file. * lisp/cus-edit.el (customize-changed-options-previous-release): Set last version to 29.1.	2022-11-28 20:03:07 +02:00