diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:37:36 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:37:36 -0700 |
commit | fa9d9041aa05263b5331e32f99f7e3d5a1f16696 (patch) | |
tree | c04ce068cefba3b22d9eeacdaf434d808cd92c6f /lisp/emacs-lisp/cl-indent.el | |
parent | 4dad9675c58ea82f6d2f8ec8dfa10d67d754d1d1 (diff) | |
parent | 0ae9a816b9f68bd3f50fc287a342237c8b4fe78d (diff) | |
download | emacs-fa9d9041aa05263b5331e32f99f7e3d5a1f16696.tar.gz emacs-fa9d9041aa05263b5331e32f99f7e3d5a1f16696.tar.bz2 emacs-fa9d9041aa05263b5331e32f99f7e3d5a1f16696.zip |
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
Diffstat (limited to 'lisp/emacs-lisp/cl-indent.el')
0 files changed, 0 insertions, 0 deletions