/* Record indices of function doc strings stored in a file.
- Copyright (C) 1985, 86,93,94,95,97,98,99, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1985, 86,93,94,95,97,98,99,2000,04
+ Free Software Foundation, Inc.
This file is part of GNU Emacs.
The function takes one argument, FILENAME, a string;
it specifies the file name (without a directory) of the DOC file.
That file is found in `../etc' now; later, when the dumped Emacs is run,
-the same file name is found in the `data-directory'. */)
+the same file name is found in the `doc-directory'. */)
(filename)
Lisp_Object filename;
{
*p = '_';
p++;
}
-#endif /* not VMS4_4 */
-#ifdef VMS4_4
+#else /* VMS4_4 */
strcpy (name, sys_translate_unix (name));
#endif /* VMS4_4 */
#endif /* VMS */
else if (p[1] == 'F')
store_function_docstring (sym, pos + end + 1 - buf);
+ else if (p[1] == 'S')
+ ; /* Just a source file name boundary marker. Ignore it. */
+
else
error ("DOC file invalid at position %d", pos);
}
idx = strp - SDATA (string);
tem = Fintern (make_string (start, length_byte), Qnil);
+ /* Ignore remappings unless there are no ordinary bindings. */
+ tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, Qt);
+ if (NILP (tem))
+ tem = Fwhere_is_internal (tem, keymap, Qt, Qnil, 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, Qnil);
strp = SDATA (string) + idx;
start = SDATA (string) + start_idx;
}
else
{ /* function is on a key */
- tem = Fkey_description (tem);
+ tem = Fkey_description (tem, Qnil);
goto subst_string;
}
}