aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/category.c22
2 files changed, 19 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 58661af0867..a25239d88a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12004-02-19 Luc Teirlinck <teirllm@auburn.edu>
2
3 * category.c (Fdefine_category, Fcategory_docstring)
4 (Fget_unused_category, Fset_category_table)
5 (Fcategory_set_mnemonics): Doc fixes.
6
12004-02-20 Kim F. Storm <storm@cua.dk> 72004-02-20 Kim F. Storm <storm@cua.dk>
2 8
3 * keyboard.c: Undo 2004-02-16 and 2004-02-17 changes. 9 * keyboard.c: Undo 2004-02-16 and 2004-02-17 changes.
@@ -7,7 +13,7 @@
7 (read_avail_input): Separate and rework handling of read_socket_hook 13 (read_avail_input): Separate and rework handling of read_socket_hook
8 and non-read_socket_hook cases. Use smaller input_event buffer 14 and non-read_socket_hook cases. Use smaller input_event buffer
9 in read_socket_hook case, and repeat if full buffer is read. Use 15 in read_socket_hook case, and repeat if full buffer is read. Use
10 new local variable 'discard' to skip input after C-g. 16 new local variable 'discard' to skip input after C-g.
11 In non-read_socket_hook case, just use a single input_event, and 17 In non-read_socket_hook case, just use a single input_event, and
12 call kbd_buffer_store_event on the fly for each character. 18 call kbd_buffer_store_event on the fly for each character.
13 19
diff --git a/src/category.c b/src/category.c
index 223ec20cd73..b7eadd0e771 100644
--- a/src/category.c
+++ b/src/category.c
@@ -87,11 +87,11 @@ those categories. */)
87Lisp_Object check_category_table (); 87Lisp_Object check_category_table ();
88 88
89DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0, 89DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0,
90 doc: /* Define CHAR as a category which is described by DOCSTRING. 90 doc: /* Define CATEGORY as a category which is described by DOCSTRING.
91CHAR should be an ASCII printing character in the range ` ' to `~'. 91CATEGORY should be an ASCII printing character in the range ` ' to `~'.
92DOCSTRING is a documentation string of the category. 92DOCSTRING is the documentation string of the category.
93The category is defined only in category table TABLE, which defaults to 93The category is defined only in category table TABLE, which defaults to
94 the current buffer's category table. */) 94the current buffer's category table. */)
95 (category, docstring, table) 95 (category, docstring, table)
96 Lisp_Object category, docstring, table; 96 Lisp_Object category, docstring, table;
97{ 97{
@@ -107,7 +107,9 @@ The category is defined only in category table TABLE, which defaults to
107} 107}
108 108
109DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0, 109DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
110 doc: /* Return the documentation string of CATEGORY, as defined in CATEGORY-TABLE. */) 110 doc: /* Return the documentation string of CATEGORY, as defined in TABLE.
111TABLE should be a category table and defaults to the current buffer's
112category table. */)
111 (category, table) 113 (category, table)
112 Lisp_Object category, table; 114 Lisp_Object category, table;
113{ 115{
@@ -119,10 +121,9 @@ DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
119 121
120DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category, 122DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category,
121 0, 1, 0, 123 0, 1, 0,
122 doc: /* Return a category which is not yet defined in CATEGORY-TABLE. 124 doc: /* Return a category which is not yet defined in TABLE.
123If no category remains available, return nil. 125If no category remains available, return nil.
124The optional argument CATEGORY-TABLE 126The optional argument TABLE specifies which category table to modify;
125specifies which category table to modify;
126it defaults to the current buffer's category table. */) 127it defaults to the current buffer's category table. */)
127 (table) 128 (table)
128 Lisp_Object table; 129 Lisp_Object table;
@@ -267,7 +268,8 @@ DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
267} 268}
268 269
269DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0, 270DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0,
270 doc: /* Specify TABLE as the category table for the current buffer. */) 271 doc: /* Specify TABLE as the category table for the current buffer.
272Return TABLE. */)
271 (table) 273 (table)
272 Lisp_Object table; 274 Lisp_Object table;
273{ 275{
@@ -294,7 +296,7 @@ DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics,
294 Scategory_set_mnemonics, 1, 1, 0, 296 Scategory_set_mnemonics, 1, 1, 0,
295 doc: /* Return a string containing mnemonics of the categories in CATEGORY-SET. 297 doc: /* Return a string containing mnemonics of the categories in CATEGORY-SET.
296CATEGORY-SET is a bool-vector, and the categories \"in\" it are those 298CATEGORY-SET is a bool-vector, and the categories \"in\" it are those
297that are indexes where t occurs the bool-vector. 299that are indexes where t occurs in the bool-vector.
298The return value is a string containing those same categories. */) 300The return value is a string containing those same categories. */)
299 (category_set) 301 (category_set)
300 Lisp_Object category_set; 302 Lisp_Object category_set;