]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-26
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Jan 2018 23:29:25 +0000 (15:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Jan 2018 23:29:25 +0000 (15:29 -0800)
commit646c8e56f8a11832f25523907b85d6522a99f361
tree80ffd41982cfa018b827304ec5137ae6025f6080
parent85f5ee14b55489845eaafbdf70d7f4e25ec44ed7
parentd382d2bfc5072d4220b3e51785d22f70b147d63f
Merge from origin/emacs-26

d382d2bfc5 * etc/DEBUG (Getting control to the debugger): Fix grammar.
687af4c8e8 * lisp/vc/vc.el (vc-region-history): log-view-vc-fileset h...
43e2aafae3 Don't bind dframe events on load (Bug#29599)
ab31bf3c5f * lisp/textmodes/picture.el (picture-mode-exit): Doc fix. ...
ed44d92fa6 * lisp/textmodes/picture.el (picture-open-line): Doc fix. ...
b87a772612 Fix description of 'emacs-internal'
a5256da588 Update PROBLEMS with selection-related issues
c59ecb005e New customization variable for python-mode indentation (Bu...
4e20c8f220 Fix menu keyboard shortcuts on macOS (Bug#29595)

# Conflicts:
# etc/NEWS
etc/DEBUG
etc/NEWS.26
etc/PROBLEMS
lisp/vc/vc.el
src/nsmenu.m