]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-29
authorStefan Kangas <stefankangas@gmail.com>
Thu, 9 Mar 2023 05:30:23 +0000 (06:30 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Thu, 9 Mar 2023 05:30:23 +0000 (06:30 +0100)
7e1012765c4 Fix libwebp check for some webp installations
c2ca009da4c Avoid potential infloop
34c14430e9d Don't misindent 'else:' after 'if re.match:' in Python
8a2a554192a * Make sure `default-directory' exists before spawning pr...
1862e7eb7ef Fix sed expression in install-etc make target
c8ec0017cb9 Avoid using bash in the emacsclient desktop file
a588937094f Fix documentation of the 'line-height' text property
971ded31c4f Add 'declare' specs to with- and without-restriction

1  2 
configure.ac
lisp/emacs-lisp/comp.el
lisp/subr.el

diff --cc configure.ac
Simple merge
Simple merge
diff --cc lisp/subr.el
Simple merge