]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91b263e 9fb185a)
Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Tue, 12 Jan 2016 06:48:10 +0000 (22:48 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Tue, 12 Jan 2016 06:48:10 +0000 (22:48 -0800)
9fb185a shr-tag-video bug fix
6300655 Minor fixes in tramp-tests.el
50575b1 Ensure redisplay when 'truncate-lines' is set
0d9e80d Fix a doc string of 'transient-mark-mode'
0000ae5 MS-Windows followup to latest gnulib update
4bc5e02 Spelling fix
f1093f7 Do secure signed Bcc handling

1  2 
lisp/net/shr.el patch | diff1 | diff2 | blob | history
test/lisp/net/tramp-tests.el patch | diff1 | diff2 | blob | history

diff --cc lisp/net/shr.el
Simple merge
diff --cc test/lisp/net/tramp-tests.el
Simple merge