]> git.eshelyaron.com Git - emacs.git/commit
Merge from savannah/emacs-29
authorPo Lu <luangruo@yahoo.com>
Fri, 24 Nov 2023 00:38:03 +0000 (08:38 +0800)
committerPo Lu <luangruo@yahoo.com>
Fri, 24 Nov 2023 00:38:03 +0000 (08:38 +0800)
commit9db8c349f0674c356ad1c04e62d75af958c486e8
tree486bc0e6c7829fdd6d03bae7a94142f84a2faae5
parent29d42d9158ae836fc30d72dbdf4a8236a01de87f
parentd72a4ed65ce23581ff8b3bf4340caecf31c18f43
Merge from savannah/emacs-29

d72a4ed65ce Fix 'with-sqlite-transaction' when BODY fails
a7b3c923733 ; * doc/emacs/cmdargs.texi (Initial Options): Fix last ch...
fd76a80864d ; Mention that -x and --script ignore file-locals
e0469ddb9d4 ; * doc/emacs/search.texi (Special Isearch): More accurat...
e521669fb3f Fix wording in ELisp Intro manual
da946ca6924 Add missing python-ts-mode keyword (bug#67015)
0128495afde Fix string-pixel-width with global setting of display-lin...

# Conflicts:
# etc/NEWS
doc/emacs/search.texi
doc/lispref/text.texi
etc/NEWS.29
lisp/emacs-lisp/subr-x.el
lisp/progmodes/python.el