Get rid of funvec.

[bpt/emacs.git] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index b47bf81..de20edb 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -36,6 +36,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 Lisp_Object Qfunction_documentation;
 
+extern Lisp_Object Qclosure;
 /* Buffer used for reading from documentation file.  */
 static char *get_doc_string_buffer;
 static int get_doc_string_buffer_size;
@@ -260,7 +261,7 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition)
      the same way we would read bytes from a file.  */
   if (definition)
     {
-      read_bytecode_pointer = get_doc_string_buffer + offset;
+      read_bytecode_pointer = (unsigned char *) get_doc_string_buffer + offset;
       return Fread (Qlambda);
     }
 
@@ -270,8 +271,10 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition)
   else
     {
       /* The data determines whether the string is multibyte.  */
-      EMACS_INT nchars = multibyte_chars_in_text (get_doc_string_buffer + offset,
-                                                 to - (get_doc_string_buffer + offset));
+      EMACS_INT nchars =
+       multibyte_chars_in_text (((unsigned char *) get_doc_string_buffer
+                                 + offset),
+                                to - (get_doc_string_buffer + offset));
       return make_string_from_bytes (get_doc_string_buffer + offset,
                                     nchars,
                                     to - (get_doc_string_buffer + offset));
@@ -381,6 +384,8 @@ string is passed through `substitute-command-keys'.  */)
          else
            return Qnil;
        }
+      else if (EQ (funcar, Qclosure))
+       return Fdocumentation (Fcdr (XCDR (fun)), raw);
       else if (EQ (funcar, Qmacro))
        return Fdocumentation (Fcdr (fun), raw);
       else
@@ -473,7 +478,7 @@ aren't strings.  */)
     }
   else if (!STRINGP (tem))
     /* Feval protects its argument.  */
-    tem = Feval (tem);
+    tem = Feval (tem, Qnil);
 
   if (NILP (raw) && STRINGP (tem))
     tem = Fsubstitute_command_keys (tem);
@@ -508,6 +513,8 @@ store_function_docstring (Lisp_Object fun, EMACS_INT offset)
        }
       else if (EQ (tem, Qmacro))
        store_function_docstring (XCDR (fun), offset);
+      else if (EQ (tem, Qclosure))
+       store_function_docstring (Fcdr (XCDR (fun)), offset);
     }
 
   /* Bytecode objects sometimes have slots for it.  */
@@ -630,7 +637,8 @@ the same file name is found in the `doc-directory'.  */)
             }
 
          sym = oblookup (Vobarray, p + 2,
-                         multibyte_chars_in_text (p + 2, end - p - 2),
+                         multibyte_chars_in_text ((unsigned char *) p + 2,
+                                                  end - p - 2),
                          end - p - 2);
          /* Check skip_file so that when a function is defined several
             times in different files (typically, once in xterm, once in
@@ -685,10 +693,10 @@ Returns original STRING if no substitutions were made.  Otherwise,
 a new string, without any text properties, is returned.  */)
   (Lisp_Object string)
 {
-  unsigned char *buf;
+  char *buf;
   int changed = 0;
   register unsigned char *strp;
-  register unsigned char *bufp;
+  register char *bufp;
   EMACS_INT idx;
   EMACS_INT bsize;
   Lisp_Object tem;
@@ -716,12 +724,12 @@ a new string, without any text properties, is returned.  */)
      or a specified local map (which means search just that and the
      global map).  If non-nil, it might come from Voverriding_local_map,
      or from a \\<mapname> construct in STRING itself..  */
-  keymap = current_kboard->Voverriding_terminal_local_map;
+  keymap = KVAR (current_kboard, Voverriding_terminal_local_map);
   if (NILP (keymap))
     keymap = Voverriding_local_map;
 
   bsize = SBYTES (string);
-  bufp = buf = (unsigned char *) xmalloc (bsize);
+  bufp = buf = (char *) xmalloc (bsize);
 
   strp = SDATA (string);
   while (strp < SDATA (string) + SBYTES (string))
@@ -768,7 +776,7 @@ a new string, without any text properties, is returned.  */)
 
          /* Save STRP in IDX.  */
          idx = strp - SDATA (string);
-         name = Fintern (make_string (start, length_byte), Qnil);
+         name = Fintern (make_string ((char *) start, length_byte), Qnil);
 
        do_remap:
          tem = Fwhere_is_internal (name, keymap, Qt, Qnil, Qnil);
@@ -790,7 +798,7 @@ a new string, without any text properties, is returned.  */)
          if (NILP (tem))       /* but not on any keys */
            {
              EMACS_INT offset = bufp - buf;
-             buf = (unsigned char *) xrealloc (buf, bsize += 4);
+             buf = (char *) xrealloc (buf, bsize += 4);
              bufp = buf + offset;
              memcpy (bufp, "M-x ", 4);
              bufp += 4;
@@ -835,7 +843,7 @@ a new string, without any text properties, is returned.  */)
          /* Get the value of the keymap in TEM, or nil if undefined.
             Do this while still in the user's current buffer
             in case it is a local variable.  */
-         name = Fintern (make_string (start, length_byte), Qnil);
+         name = Fintern (make_string ((char *) start, length_byte), Qnil);
          tem = Fboundp (name);
          if (! NILP (tem))
            {
@@ -884,7 +892,7 @@ a new string, without any text properties, is returned.  */)
        subst:
          {
            EMACS_INT offset = bufp - buf;
-           buf = (unsigned char *) xrealloc (buf, bsize += length_byte);
+           buf = (char *) xrealloc (buf, bsize += length_byte);
            bufp = buf + offset;
            memcpy (bufp, start, length_byte);
            bufp += length_byte;