From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 22:23:09 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2686
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44f853c4acda0634a3541116834c3e768bef650d;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

1ef309f Restore window conf in nsm
---

44f853c4acda0634a3541116834c3e768bef650d