diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-22 14:38:49 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-22 14:38:49 -0700 |
| commit | 590dab5a68f4283d53ce79d4633fe1503131baea (patch) | |
| tree | 2e2452d22d54826cb84e2c5dc976abbb2ed40322 /src | |
| parent | caa2770d1d79f9c8013d6dddcd9e86d05230b26d (diff) | |
| parent | 8c2946e29b38fa3e0dff6b4d402ba0fda0e03c9b (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/category.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/category.c b/src/category.c index 4397f662ba..8315797408 100644 --- a/src/category.c +++ b/src/category.c @@ -336,6 +336,8 @@ The category is changed only for table TABLE, which defaults to the current buffer's category table. CHARACTER can be either a single character or a cons representing the lower and upper ends of an inclusive character range to modify. +CATEGORY must be a category name (a character between ` ' and `~'). +Use `describe-categories' to see existing category names. If optional fourth argument RESET is non-nil, then delete CATEGORY from the category set instead of adding it. */) (Lisp_Object character, Lisp_Object category, Lisp_Object table, Lisp_Object reset) |