From: Glenn Morris <rgm@gnu.org>
Date: Thu, 18 Jan 2018 22:02:32 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5855
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5b70d8330b35d5a344d57dc98029c2786c10ce3;p=emacs.git

Merge from origin/emacs-26

779b2ac Use recommended long options syntax in man page
c433e87 An overdue update of GNUstep emacs.tiff
188a9d9 Add some test skip conditions
---

d5b70d8330b35d5a344d57dc98029c2786c10ce3