master updated (a81c3cc -> 33ad2bf)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  a81c3cc   Fix the build broken by recent commits
       new  f921f18   Partially revert previous make-separator-line change
       new  cf9d85c   Add an example to the display-supports-face-attributes-p 
doc string
       new  33ad2bf   Include make Errors in admin/emake


Summary of changes:
 admin/emake    |  1 +
 lisp/simple.el | 14 ++++++++++----
 src/xfaces.c   |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)