]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorEli Zaretskii <eliz@gnu.org>
Sun, 31 Oct 2021 16:46:28 +0000 (18:46 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 31 Oct 2021 16:46:29 +0000 (18:46 +0200)
f1c9286 ; * doc/misc/org.org: fix capture context example
af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emac...
610680a Fix rendering of title-less <abbr> tags in shr
2ba4ccf ; * lisp/files.el (make-nearby-temp-file): Doc fix.

1  2 
lisp/files.el
lisp/net/shr.el

diff --cc lisp/files.el
Simple merge
diff --cc lisp/net/shr.el
Simple merge