From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 26 Sep 2016 20:37:36 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1543
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa9d9041aa05263b5331e32f99f7e3d5a1f16696;p=emacs.git

Merge from origin/emacs-25

0ae9a81 Document 'timerp'
2c72c46 Improve documentation of overlay priorities
f6fa160 Fix 'dired-compress-files'
2b8c5f0 Update commentary of STRING_CHAR and FETCH_MULTIBYTE_CHAR

# Conflicts:
#	lisp/dired.el
#	src/buffer.h
#	src/character.h
---

fa9d9041aa05263b5331e32f99f7e3d5a1f16696