| commit | 5f1cf4b5c7640ed747bd867712a4580bc2e5b92f | |
| author | Glenn Morris <rgm@gnu.org> | |
| Mon, 20 Nov 2017 18:10:11 +0000 (20 13:10 -0500) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Mon, 20 Nov 2017 18:10:11 +0000 (20 13:10 -0500) | ||
| tree | 0114e9e8c6e49ccaaa4253fc36808bccd89a9edc | treesnapshot (tar.gz zip) |
| parent | 7aa59d42a72ef51e0ee902b67097983fc1bfe44c | commitdiff |
| parent | fc5b8f105505b4f9bb32c5d84d685ab0bc991802 | commitdiff |
Merge from origin/emacs-26
fc5b8f1 Fix Bug#29149
5622b2e Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
4da8799 (emacs-26) Fix misbehavior when drawing three-pixel high hori...
1b082c8 MH-E: don't automatically download external-body parts
069f978 ; * lisp/emacs-lisp/byte-run.el: Fix a typo in a comment.
504a56c ; Fix last commit
a34e44e ; Fix last commit
a8892b4 Further fix for Bug#29291
d14923b Fix divider frame params on NS (bug#29352)
b2518ac Spelling fixes
# Conflicts:
# etc/NEWS
# test/lisp/net/tramp-tests.el
fc5b8f1 Fix Bug#29149
5622b2e Merge branch 'emacs-26' of git.sv.gnu.org:/srv/git/emacs into...
4da8799 (emacs-26) Fix misbehavior when drawing three-pixel high hori...
1b082c8 MH-E: don't automatically download external-body parts
069f978 ; * lisp/emacs-lisp/byte-run.el: Fix a typo in a comment.
504a56c ; Fix last commit
a34e44e ; Fix last commit
a8892b4 Further fix for Bug#29291
d14923b Fix divider frame params on NS (bug#29352)
b2518ac Spelling fixes
# Conflicts:
# etc/NEWS
# test/lisp/net/tramp-tests.el
| etc/NEWS.26 | diff1 | diff2 | blobhistory |
| lisp/help-fns.el | diff1 | diff2 | blobhistory |
| lisp/net/tramp.el | diff1 | diff2 | blobhistory |
| test/lisp/net/tramp-tests.el | diff1 | diff2 | blobhistory |