]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a346d5b 59b5dc6)
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Oct 2017 20:44:56 +0000 (13:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 12 Oct 2017 20:44:56 +0000 (13:44 -0700)
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

1  2 
src/fileio.c patch | diff1 | diff2 | blob | history

diff --cc src/fileio.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.