Merge from origin/emacs-26
commitd0f910cbf862db2a89d56e6414c93a93e46e202b
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Oct 2017 20:44:56 +0000 (12 13:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Oct 2017 20:44:56 +0000 (12 13:44 -0700)
tree0504513f33cdb0a31e5b04ecd60c374a5d096dda
parenta346d5bd25acee99bb94f9b785507d4e4ccb554b
parent59b5dc60d660f81f8b781068d13727ed812ad555
Merge from origin/emacs-26

59b5dc60d6 Fix this-command-keys for "M-x foo" commands
2f4bd2fbda Let rename-file rename dirs across filesystems
413978727c Simplify Flymake user documentation
6ff18c3995 * etc/NEWS: Mention the new version of Org.
b78332c3c6 Don't use (format "%s" ...) for string copying (Bug#28774)
078fb7f6df Make frame-list-z-order on NS match Windows behaviour (bug...

# Conflicts:
# etc/NEWS
src/fileio.c