(Fmake_indirect_buffer, Fset_buffer_major_mode, Fpop_to_buffer,

[gnu-emacs] / src / doc.c

diff --git a/src/doc.c b/src/doc.c
index 67f91a4209ffe21e5d51f290efde1a08d7d321ed..9801b961912646783785348c976f9ba58b49f78c 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -1,11 +1,11 @@
 /* Record indices of function doc strings stored in a file.
-   Copyright (C) 1985, 1986, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1994, 1995 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -72,7 +72,10 @@ munge_doc_file_name (name)
 /* Extract a doc string from a file.  FILEPOS says where to get it.
    If it is an integer, use that position in the standard DOC-... file.
    If it is (FILE . INTEGER), use FILE as the file name
-   and INTEGER as the position in that file.  */
+   and INTEGER as the position in that file.
+   But if INTEGER is negative, make it positive.
+   (A negative integer is used for user variables, so we can distinguish
+   them without actually fetching the doc string.)  */
 
 static Lisp_Object
 get_doc_string (filepos)
@@ -99,6 +102,8 @@ get_doc_string (filepos)
     {
       file = XCONS (filepos)->car;
       position = XINT (XCONS (filepos)->cdr);
+      if (position < 0)
+       position = - position;
     }
   else
     return Qnil;
@@ -126,7 +131,7 @@ get_doc_string (filepos)
     }
   else
     {
-      name = XSTRING (file)->data;
+      name = (char *) XSTRING (file)->data;
     }
 
   fd = open (name, O_RDONLY, 0);
@@ -279,7 +284,7 @@ string is passed through `substitute-command-keys'.")
     }
   else if (COMPILEDP (fun))
     {
-      if (XVECTOR (fun)->size <= COMPILED_DOC_STRING)
+      if ((XVECTOR (fun)->size & PSEUDOVECTOR_SIZE_MASK) <= COMPILED_DOC_STRING)
        return Qnil;
       tem = XVECTOR (fun)->contents[COMPILED_DOC_STRING];
       if (STRINGP (tem))
@@ -304,10 +309,15 @@ subcommands.)");
       else if (EQ (funcar, Qlambda)
               || EQ (funcar, Qautoload))
        {
-         tem = Fcar (Fcdr (Fcdr (fun)));
+         Lisp_Object tem1;
+         tem1 = Fcdr (Fcdr (fun));
+         tem = Fcar (tem1);
          if (STRINGP (tem))
            doc = tem;
-         else if (NATNUMP (tem) || CONSP (tem))
+         /* Handle a doc reference--but these never come last
+            in the function body, so reject them if they are last.  */
+         else if ((NATNUMP (tem) || CONSP (tem))
+                  && ! NILP (XCONS (tem1)->cdr))
            doc = get_doc_string (tem);
          else
            return Qnil;
@@ -362,7 +372,8 @@ translation.")
 static void
 store_function_docstring (fun, offset)
      Lisp_Object fun;
-     int offset;
+     /* Use EMACS_INT because we get this from pointer subtraction.  */
+     EMACS_INT offset;
 {
   fun = indirect_function (fun);
 
@@ -393,7 +404,7 @@ store_function_docstring (fun, offset)
     {
       /* This bytecode object must have a slot for the
         docstring, since we've found a docstring for it.  */
-      if (XVECTOR (fun)->size > COMPILED_DOC_STRING)
+      if ((XVECTOR (fun)->size & PSEUDOVECTOR_SIZE_MASK) > COMPILED_DOC_STRING)
        XSETFASTINT (XVECTOR (fun)->contents[COMPILED_DOC_STRING], offset);
     }
 }
@@ -547,7 +558,9 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
      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 STR itself..  */
-  keymap = Voverriding_local_map;
+  keymap = current_kboard->Voverriding_terminal_local_map;
+  if (NILP (keymap))
+    keymap = Voverriding_local_map;
 
   bsize = XSTRING (str)->size;
   bufp = buf = (unsigned char *) xmalloc (bsize);
@@ -655,7 +668,7 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
          else if (start[-1] == '<')
            keymap = tem;
          else
-           describe_map_tree (tem, 1, Qnil, Qnil, 0, 1);
+           describe_map_tree (tem, 1, Qnil, Qnil, (char *)0, 1, 0);
          tem = Fbuffer_string ();
          Ferase_buffer ();
          set_buffer_internal (oldbuf);