diff --git a/ChangeLog b/ChangeLog
index b091c7e..d872a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-11-02  Bruno Haible  <bruno@clisp.org>
 
+	* src/options.h (Options::get_delimiters): Renamed from
+	Options::get_delimiter.
+	* src/options.icc (Options::get_delimiters): Renamed from
+	Options::get_delimiter.
+	* src/input.cc (Input::read_keys): Update.
+
 	Bug fix.
 	* src/options.cc (Options::print_options): Escape backquote inside
 	double-quoted strings.
diff --git a/src/input.cc b/src/input.cc
index bc7d5b8..d152fe0 100644
--- a/src/input.cc
+++ b/src/input.cc
@@ -343,14 +343,14 @@ Input::read_keys ()
     }
 
   /* Read in all the keywords from the input file. */
-  const char *delimiter = option.get_delimiter ();
+  const char *delimiters = option.get_delimiters ();
 
-  _head = parse_line (ptr, delimiter);
+  _head = parse_line (ptr, delimiters);
 
   for (Keyword_List *temp = _head;
        (ptr = Read_Line::read_next_line ()) && strcmp (ptr, "%%");
        temp = temp->rest())
-    temp->rest() = parse_line (ptr, delimiter);
+    temp->rest() = parse_line (ptr, delimiters);
 
   /* See if any additional C code is included at end of this file. */
   _additional_code = false;
diff --git a/src/options.h b/src/options.h
index d53e2b0..c184569 100644
--- a/src/options.h
+++ b/src/options.h
@@ -215,19 +215,21 @@ public:
   const char *          get_wordlist_name () const;
 
   /* Returns the string used to delimit keywords from other attributes.  */
-  const char *          get_delimiter () const;
+  const char *          get_delimiters () const;
 
-  /* Returns key positions.  */
+  /* Returns key positions.
+     Only to be called if !options[ALLCHARS].  */
   const Positions&      get_key_positions () const;
 
-  /* Returns total distinct key positions. */
+  /* Returns total distinct key positions.
+     Only to be called if !options[ALLCHARS].  */
   int                   get_max_keysig_size () const;
 
 private:
-  /* Prints program usage to given stream. */
+  /* Prints program usage to given stream.  */
   void                  short_usage (FILE * stream) const;
 
-  /* Prints program usage to given stream. */
+  /* Prints program usage to given stream.  */
   void                  long_usage (FILE * stream) const;
 
   /* Records count of command-line arguments.  */
diff --git a/src/options.icc b/src/options.icc
index d3f9716..e452170 100644
--- a/src/options.icc
+++ b/src/options.icc
@@ -193,19 +193,21 @@ Options::get_wordlist_name () const
 
 /* Returns the string used to delimit keywords from other attributes.  */
 INLINE const char *
-Options::get_delimiter () const
+Options::get_delimiters () const
 {
   return _delimiters;
 }
 
-/* Returns key positions.  */
+/* Returns key positions.
+   Only to be called if !options[ALLCHARS].  */
 INLINE const Positions&
 Options::get_key_positions () const
 {
   return _key_positions;
 }
 
-/* Returns total distinct key positions. */
+/* Returns total distinct key positions.
+   Only to be called if !options[ALLCHARS].  */
 INLINE int
 Options::get_max_keysig_size () const
 {