Eli Zaretskii 2d1a96e878 Merge from origin/emacs-29 ... 305246d972 Add emoji-zoom-reset 470d269ec1 Make emoji-zoom-{increase,decrease} set text properties c... 63d4a86f8d Fix transforming sliced images 5e1953a8f8 ; * etc/NEWS: Minor copyedits of entry for 'keymap-*' fun... 6b9f9df945 ; Improve documentation of 'declare-function' 81d1f46d0f ; Avoid compiler warning in eglot.el. 38cdfcb212 ; Fix description of new 'keymap-*' functions 257090b872 Adapt EMBA scripts. 90c07d3fdd Another terminology fix in ELisp reference manual a832bc7090 Correct terminology in Elisp Reference Manual db308233cb Comment out GNUSTEP jobs on EMBA (again) 8c1b102243 ; * lisp/image.el (put-image): Doc fix. eda88c63ad ; * doc/emacs/trouble.texi (Checklist): Minor grammar fix. 728bc09cf3 Fix regexp string escaping mistake in vhdl-mode.el (bug#6... 479626dbac Update to Org 9.6.3-2-gf2949d 5a1c9aace7 ; Add a bit more docstring to tsx-ts-mode (bug#62429) 86cf9fd932 Eglot: don't watch directories that don't exist 82d0b6c64e ; * lisp/subr.el (use-dialog-box-p): Fix last change. 3619663f98 Preserve peer information for web page in eww-readable cb8d6ab648 * lisp/subr.el (use-dialog-box-p): Fix conditions for GUI... fb2c440920 ; * lisp/progmodes/c-ts-mode.el (c++-ts-mode): Add some n... # Conflicts: # etc/NEWS		2023-04-06 14:38:20 -04:00
..
Dockerfile.emba	Merge from origin/emacs-29	2023-04-06 14:38:20 -04:00
gitlab-ci.yml	Adapt EMBA scripts.	2023-04-04 20:01:19 +02:00
Makefile.in	; Add 2023 to copyright years.	2023-01-01 05:31:12 -05:00
test-jobs.yml	* test/infra/test-jobs.yml: Regenerate for the new use-package subdirectory.	2022-12-09 15:53:49 +01:00