upstream

1 files changed, 9 insertions, 13 deletions

diff --git a/src/doc.c b/src/doc.c
index 223741c3bf5..44363e30e82 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -42,9 +42,6 @@ static char *get_doc_string_buffer;
 static ptrdiff_t get_doc_string_buffer_size;
 
 static unsigned char *read_bytecode_pointer;
-static Lisp_Object Fdocumentation_property (Lisp_Object, Lisp_Object,
-                                            Lisp_Object);
-static Lisp_Object Fsnarf_documentation (Lisp_Object);
 
 /* readchar in lread.c calls back here to fetch the next byte.
    If UNREADFLAG is 1, we unread a byte.  */
@@ -384,7 +381,7 @@ string is passed through `substitute-command-keys'.  */)
     }
   else if (CONSP (fun))
     {
-      funcar = Fcar (fun);
+      funcar = XCAR (fun);
       if (!SYMBOLP (funcar))
         xsignal1 (Qinvalid_function, fun);
       else if (EQ (funcar, Qkeymap))
@@ -580,14 +577,13 @@ the same file name is found in the `doc-directory'.  */)
       (0)
 #endif /* CANNOT_DUMP */
     {
-      name = (char *) alloca (SCHARS (filename) + 14);
+      name = alloca (SCHARS (filename) + 14);
       strcpy (name, "../etc/");
     }
   else
     {
       CHECK_STRING (Vdoc_directory);
-      name = (char *) alloca (SCHARS (filename)
-                          + SCHARS (Vdoc_directory) + 1);
+      name = alloca (SCHARS (filename) + SCHARS (Vdoc_directory) + 1);
       strcpy (name, SSDATA (Vdoc_directory));
     }
   strcat (name, SSDATA (filename));     /*** Add this line ***/
@@ -649,7 +645,7 @@ the same file name is found in the `doc-directory'.  */)
                 {
                   ptrdiff_t len = end - p - 2;
                   char *fromfile = alloca (len + 1);
-                  strncpy (fromfile, &p[2], len);
+                  memcpy (fromfile, &p[2], len);
                   fromfile[len] = 0;
                   if (fromfile[len-1] == 'c')
                     fromfile[len-1] = 'o';
@@ -760,7 +756,7 @@ Otherwise, return a new string, without any text properties.  */)
     keymap = Voverriding_local_map;
 
   bsize = SBYTES (string);
-  bufp = buf = (char *) xmalloc (bsize);
+  bufp = buf = xmalloc (bsize);
 
   strp = SDATA (string);
   while (strp < SDATA (string) + SBYTES (string))
@@ -831,7 +827,7 @@ Otherwise, return a new string, without any text properties.  */)
               ptrdiff_t offset = bufp - buf;
               if (STRING_BYTES_BOUND - 4 < bsize)
                 string_overflow ();
-              buf = (char *) xrealloc (buf, bsize += 4);
+              buf = xrealloc (buf, bsize += 4);
               bufp = buf + offset;
               memcpy (bufp, "M-x ", 4);
               bufp += 4;
@@ -897,11 +893,11 @@ Otherwise, return a new string, without any text properties.  */)
           if (NILP (tem))
             {
               name = Fsymbol_name (name);
-              insert_string ("\nUses keymap \"");
+              insert_string ("\nUses keymap `");
               insert_from_string (name, 0, 0,
                                   SCHARS (name),
                                   SBYTES (name), 1);
-              insert_string ("\", which is not currently defined.\n");
+              insert_string ("', which is not currently defined.\n");
               if (start[-1] == '<') keymap = Qnil;
             }
           else if (start[-1] == '<')
@@ -927,7 +923,7 @@ Otherwise, return a new string, without any text properties.  */)
             ptrdiff_t offset = bufp - buf;
             if (STRING_BYTES_BOUND - length_byte < bsize)
               string_overflow ();
-            buf = (char *) xrealloc (buf, bsize += length_byte);
+            buf = xrealloc (buf, bsize += length_byte);
             bufp = buf + offset;
             memcpy (bufp, start, length_byte);
             bufp += length_byte;