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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/character.h b/src/character.h
index b72b61d7054..fc8a0dd74d2 100644
--- a/src/character.h
+++ b/src/character.h
@@ -308,7 +308,7 @@ enum
       }                                                                 \
   } while (false)
 
-/* Return the character code of character whose multibyte form is at P. */
+/* Return the character code of character whose multibyte form is at P.  */
 
 #define STRING_CHAR(p)                                          \
   (!((p)[0] & 0x80)                                             \