Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-107
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-88

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 @@
+2004-02-19  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * category.c (Fdefine_category, Fcategory_docstring)
+        (Fget_unused_category, Fset_category_table)
+        (Fcategory_set_mnemonics): Doc fixes.
+
 2004-02-20  Kim F. Storm  <storm@cua.dk>
 
         * keyboard.c: Undo 2004-02-16 and 2004-02-17 changes.
@@ -7,7 +13,7 @@
         (read_avail_input): Separate and rework handling of read_socket_hook
         and non-read_socket_hook cases.  Use smaller input_event buffer
         in read_socket_hook case, and repeat if full buffer is read.  Use
-        new local variable 'discard' to skip input after C-g. 
+        new local variable 'discard' to skip input after C-g.
         In non-read_socket_hook case, just use a single input_event, and
         call kbd_buffer_store_event on the fly for each character.
 
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.  */)
 Lisp_Object check_category_table ();
 
 DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0,
-       doc: /* Define CHAR as a category which is described by DOCSTRING.
-CHAR should be an ASCII printing character in the range ` ' to `~'.
-DOCSTRING is a documentation string of the category.
+       doc: /* Define CATEGORY as a category which is described by DOCSTRING.
+CATEGORY should be an ASCII printing character in the range ` ' to `~'.
+DOCSTRING is the documentation string of the category.
 The category is defined only in category table TABLE, which defaults to
- the current buffer's category table.  */)
+the current buffer's category table.  */)
      (category, docstring, table)
      Lisp_Object category, docstring, table;
 {
@@ -107,7 +107,9 @@ The category is defined only in category table TABLE, which defaults to
 }
 
 DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
-       doc: /* Return the documentation string of CATEGORY, as defined in CATEGORY-TABLE.  */)
+       doc: /* Return the documentation string of CATEGORY, as defined in TABLE.
+TABLE should be a category table and defaults to the current buffer's
+category table.  */)
      (category, table)
      Lisp_Object category, table;
 {
@@ -119,10 +121,9 @@ DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
 
 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category,
        0, 1, 0,
-       doc: /* Return a category which is not yet defined in CATEGORY-TABLE.
+       doc: /* Return a category which is not yet defined in TABLE.
 If no category remains available, return nil.
-The optional argument CATEGORY-TABLE
-specifies which category table to modify;
+The optional argument TABLE specifies which category table to modify;
 it defaults to the current buffer's category table.  */)
      (table)
      Lisp_Object table;
@@ -267,7 +268,8 @@ DEFUN ("make-category-table", Fmake_category_table, Smake_category_table,
 }
 
 DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0,
-       doc: /* Specify TABLE as the category table for the current buffer.  */)
+       doc: /* Specify TABLE as the category table for the current buffer.
+Return TABLE.  */)
      (table)
      Lisp_Object table;
 {
@@ -294,7 +296,7 @@ DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics,
        Scategory_set_mnemonics, 1, 1, 0,
        doc: /* Return a string containing mnemonics of the categories in CATEGORY-SET.
 CATEGORY-SET is a bool-vector, and the categories \"in\" it are those
-that are indexes where t occurs the bool-vector.
+that are indexes where t occurs in the bool-vector.
 The return value is a string containing those same categories.  */)
      (category_set)
      Lisp_Object category_set;