]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorEli Zaretskii <eliz@gnu.org>
Sat, 16 Apr 2022 17:45:50 +0000 (13:45 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sat, 16 Apr 2022 17:45:50 +0000 (13:45 -0400)
5e47d6284b * lisp/gnus/mm-encode.el (mm-default-file-encoding): Fix "...
e71c7a7c60 Fix default-directory of buffers visiting files in renamed...
cccaa9c31d Fix a kill-append regression
33828e4818 * doc/misc/eww.texi (Advanced): Correct outdated info (bug...
e8d2f40f41 Clean up the MSDOS port
338eda09d8 Fix typo in next-error-find-buffer-function

# Conflicts:
# doc/misc/eww.texi

1  2 
doc/misc/eww.texi
lisp/dired-aux.el
lisp/simple.el
msdos/sed1v2.inp
msdos/sedlibmk.inp

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