]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Wed, 17 Apr 2019 16:32:40 +0000 (09:32 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 17 Apr 2019 16:32:40 +0000 (09:32 -0700)
a1c53d4 (origin/emacs-26) * admin/admin.el (make-manuals-dist--1): Up...
d0f745f Document some compilation-mode faces
23ccba0 Mention the assignment form in "Copyright Assignment"
0f5568e Fix confusing wording in the user manual
70ec392 Fix the MSDOS build when running under CWSDPMI
7a608fc * lisp/progmodes/python.el: Be more careful about temp file r...

1  2 
admin/admin.el
doc/emacs/building.texi
doc/emacs/maintaining.texi
lisp/progmodes/python.el
src/dispnew.c
src/frame.c
src/msdos.c

diff --cc admin/admin.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/msdos.c
Simple merge