| commit | 590dab5a68f4283d53ce79d4633fe1503131baea | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 22 Aug 2016 21:38:49 +0000 (22 14:38 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 22 Aug 2016 21:38:49 +0000 (22 14:38 -0700) | ||
| tree | 2e2452d22d54826cb84e2c5dc976abbb2ed40322 | treesnapshot (tar.gz zip) |
| parent | caa2770d1d79f9c8013d6dddcd9e86d05230b26d | commitdiff |
| parent | 8c2946e29b38fa3e0dff6b4d402ba0fda0e03c9b | commitdiff |
Merge from origin/emacs-25
8c2946e In NEWS describe new handling of window margins (Bug#24193)
0cee66c Facultatively ignore margins when splitting and resizing wind...
8d68147 Document CATEGORY arg to modify-category-entry
8342e74 Document char-script-table's effect on word motion
e9ff485 Further fix for 'url-http-create-request' and multibyte strings
0695235 Fix docstring of eval-expression
98b01dd Clarify when 'cursor' property is in effect
75f1882 Convert the remaining strings to unibyte before concatenating
d2db5dd Fix bug with handling the bidi cache
ccd0e92 * doc/lispref/text.texi (Change Hooks): Minor copyedits.
f785ff4 Clarify documentation of before/after-change-functions
3c9cb57 Document use of vectors in keymaps
# Conflicts:
# src/xdisp.c
8c2946e In NEWS describe new handling of window margins (Bug#24193)
0cee66c Facultatively ignore margins when splitting and resizing wind...
8d68147 Document CATEGORY arg to modify-category-entry
8342e74 Document char-script-table's effect on word motion
e9ff485 Further fix for 'url-http-create-request' and multibyte strings
0695235 Fix docstring of eval-expression
98b01dd Clarify when 'cursor' property is in effect
75f1882 Convert the remaining strings to unibyte before concatenating
d2db5dd Fix bug with handling the bidi cache
ccd0e92 * doc/lispref/text.texi (Change Hooks): Minor copyedits.
f785ff4 Clarify documentation of before/after-change-functions
3c9cb57 Document use of vectors in keymaps
# Conflicts:
# src/xdisp.c