| commit | fa9d9041aa05263b5331e32f99f7e3d5a1f16696 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 26 Sep 2016 20:37:36 +0000 (26 13:37 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 26 Sep 2016 20:37:36 +0000 (26 13:37 -0700) | ||
| tree | c04ce068cefba3b22d9eeacdaf434d808cd92c6f | treesnapshot (tar.gz zip) |
| parent | 4dad9675c58ea82f6d2f8ec8dfa10d67d754d1d1 | commitdiff |
| parent | 0ae9a816b9f68bd3f50fc287a342237c8b4fe78d | commitdiff |
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
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