GitLab

ec26c23f authors.el: Add missing ignored and renamed files
e589765b A more thorough fix for bug#19307
4e8d5860 Fix last commit
d6fee015 Tramp: Don't use a tempfile for ControlPath.
27e11c01 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10b Fix redrawing of mode lines when exposed  (Bug#19721)
50f38118 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
	lisp/ChangeLog
	src/ChangeLog
	src/xdisp.c