From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:52:26 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2395
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eced64b2f76d1f85fb6fd54c67deadf1978cb344;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

dfe1650 (ls-lisp-insert-directory): Make -B work
42bc065 Make buttons in header lines work
---

eced64b2f76d1f85fb6fd54c67deadf1978cb344