| commit | 0274862f395807d05585eb6325c5285f1bf775d8 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Fri, 5 Aug 2016 21:10:30 +0000 (5 14:10 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Fri, 5 Aug 2016 21:10:30 +0000 (5 14:10 -0700) | ||
| tree | da85c643cf8040db118538bf7705d2a461ec055a | treesnapshot (tar.gz zip) |
| parent | f902a6b89e6970eabaaf3c2c1452bf2104e2004b | commitdiff |
| parent | d08afa1d0339425f03a48e533166a7cadfa66139 | commitdiff |
Merge from origin/emacs-25
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...
# Conflicts:
# ChangeLog.2
# src/lisp.h
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...
# Conflicts:
# ChangeLog.2
# src/lisp.h