Glenn Morris edcf9edc8c Merge from origin/emacs-28 ... 2bdd5732aa (origin/emacs-28) ; * etc/NEWS: Fix last change. 492b927909 Fix help commands for menu-bar menus 9589be772d ; * etc/NEWS: Fix typos. d353fc4a00 ; Explain why "kinds of atom" isn't a typo 47a3750162 ; * etc/NEWS: Improve wording of the Emoji entry. b814712796 ; Checkdoc fixes in image-dired.el e45b3fc521 Improve function documentation with text from XDG BDS spec 284c77eeb6 * lisp/transient.el: Update to package version 0.3.7. 40400e6977 ; Revert parts of "Use string-replace instead of replace-r... 214c2e268c ; Revert parts of "Use string-search instead of string-mat... # Conflicts: # etc/NEWS		2021-10-27 07:59:28 -07:00
..
emacs	Rename xref-pop-marker-stack to xref-go-back (bug#38797)	2021-10-25 20:45:18 +02:00
lispintro	Merge from origin/emacs-28	2021-10-27 07:59:28 -07:00
lispref	Add new function 'string-pixel-width'	2021-10-27 15:41:32 +02:00
man	* doc/man/emacs.1.in: Add --no-x-resources. (Bug#50855)	2021-09-28 15:45:27 +02:00
misc	Merge from origin/emacs-28	2021-10-25 09:34:37 -07:00