From: Paul Eggert Date: Sun, 3 Apr 2016 20:39:52 +0000 (-0700) Subject: ; Merge from origin/emacs-25 X-Git-Tag: emacs-26.0.90~2254 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=368cb23fe249334bf9d230755ae07b6410ac6852;p=emacs.git ; Merge from origin/emacs-25 The following commit was skipped: 06ae23a Handle Bug#23186 --- 368cb23fe249334bf9d230755ae07b6410ac6852