Add description of +LINE:COLUMN.

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index e8751902c11fc3439c974e611d2cfba0a8c95847..8f888316f7a7735c201425cba69607bb03fe4061 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -41,12 +41,14 @@ Boston, MA 02111-1307, USA.  */
 #include "keyboard.h"
 #include "charset.h"
 
+#ifdef HAVE_INDEX
+extern char *index P_ ((const char *, int));
+#endif
+
 Lisp_Object Vdoc_file_name, Vhelp_manyarg_func_alist;
 
 Lisp_Object Qfunction_documentation;
 
-extern char *index ();
-
 extern Lisp_Object Voverriding_local_map;
 
 /* For VMS versions with limited file name syntax,
@@ -228,9 +230,9 @@ get_doc_string (filepos, unibyte, definition)
       if (!nread)
        break;
       if (p == get_doc_string_buffer)
-       p1 = index (p + offset, '\037');
+       p1 = (char *) index (p + offset, '\037');
       else
-       p1 = index (p, '\037');
+       p1 = (char *) index (p, '\037');
       if (p1)
        {
          *p1 = 0;
@@ -311,6 +313,8 @@ string is passed through `substitute-command-keys'.")
   Lisp_Object funcar;
   Lisp_Object tem, doc;
 
+  doc = Qnil;
+  
   if (SYMBOLP (function)
       && (tem = Fget (function, Qfunction_documentation),
          !NILP (tem)))
@@ -473,9 +477,8 @@ when doc strings are referred to later in the dumped Emacs.")
   register int filled;
   register int pos;
   register char *p, *end;
-  Lisp_Object sym, fun, tem;
+  Lisp_Object sym;
   char *name;
-  extern char *index ();
 
 #ifndef CANNOT_DUMP
   if (NILP (Vpurify_flag))
@@ -532,7 +535,7 @@ when doc strings are referred to later in the dumped Emacs.")
       /* p points to ^_Ffunctionname\n or ^_Vvarname\n.  */
       if (p != end)
        {
-         end = index (p, '\n');
+         end = (char *) index (p, '\n');
          sym = oblookup (Vobarray, p + 2,
                          multibyte_chars_in_text (p + 2, end - p - 2),
                          end - p - 2);
@@ -586,7 +589,6 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
   register unsigned char *bufp;
   int idx;
   int bsize;
-  unsigned char *new;
   Lisp_Object tem;
   Lisp_Object keymap;
   unsigned char *start;
@@ -648,10 +650,12 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
       else if (strp[0] == '\\' && strp[1] == '[')
        {
          Lisp_Object firstkey;
+         int start_idx;
 
          changed = 1;
          strp += 2;            /* skip \[ */
          start = strp;
+         start_idx = start - XSTRING (string)->data;
 
          while ((strp - (unsigned char *) XSTRING (string)->data
                  < STRING_BYTES (XSTRING (string)))
@@ -664,7 +668,12 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
          /* Save STRP in IDX.  */
          idx = strp - (unsigned char *) XSTRING (string)->data;
          tem = Fintern (make_string (start, length_byte), Qnil);
+
+         /* Note the Fwhere_is_internal can GC, so we have to take
+            relocation of string contents into account.  */
          tem = Fwhere_is_internal (tem, keymap, Qt, Qnil);
+         strp = XSTRING (string)->data + idx;
+         start = XSTRING (string)->data + start_idx;
 
          /* Disregard menu bar bindings; it is positively annoying to
             mention them when there's no menu bar, and it isn't terribly
@@ -678,9 +687,9 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
 
          if (NILP (tem))       /* but not on any keys */
            {
-             new = (unsigned char *) xrealloc (buf, bsize += 4);
-             bufp += new - buf;
-             buf = new;
+             int offset = bufp - buf;
+             buf = (unsigned char *) xrealloc (buf, bsize += 4);
+             bufp = buf + offset;
              bcopy ("M-x ", bufp, 4);
              bufp += 4;
              nchars += 4;
@@ -701,10 +710,12 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
       else if (strp[0] == '\\' && (strp[1] == '{' || strp[1] == '<'))
        {
          struct buffer *oldbuf;
+         int start_idx;
 
          changed = 1;
          strp += 2;            /* skip \{ or \< */
          start = strp;
+         start_idx = start - XSTRING (string)->data;
 
          while ((strp - (unsigned char *) XSTRING (string)->data
                  < XSTRING (string)->size)
@@ -726,7 +737,12 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
            {
              tem = Fsymbol_value (name);
              if (! NILP (tem))
-               tem = get_keymap_1 (tem, 0, 1);
+               {
+                 tem = get_keymap (tem, 0, 1);
+                 /* Note that get_keymap can GC.  */
+                 strp = XSTRING (string)->data + idx;
+                 start = XSTRING (string)->data + start_idx;
+               }
            }
 
          /* Now switch to a temp buffer.  */
@@ -756,14 +772,16 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
          length = XSTRING (tem)->size;
          length_byte = STRING_BYTES (XSTRING (tem));
        subst:
-         new = (unsigned char *) xrealloc (buf, bsize += length_byte);
-         bufp += new - buf;
-         buf = new;
-         bcopy (start, bufp, length_byte);
-         bufp += length_byte;
-         nchars += length;
-         /* Check STRING again in case gc relocated it.  */
-         strp = (unsigned char *) XSTRING (string)->data + idx;
+         {
+           int offset = bufp - buf;
+           buf = (unsigned char *) xrealloc (buf, bsize += length_byte);
+           bufp = buf + offset;
+           bcopy (start, bufp, length_byte);
+           bufp += length_byte;
+           nchars += length;
+           /* Check STRING again in case gc relocated it.  */
+           strp = (unsigned char *) XSTRING (string)->data + idx;
+         }
        }
       else if (! multibyte)            /* just copy other chars */
        *bufp++ = *strp++, nchars++;