mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 14:30:43 -08:00
Code Issues Projects Releases Wiki Activity

* doc.c (Fdocumentation, Fsnarf_documentation): Move locals to

Browse source 
avoid shadowing.
This commit is contained in:
Paul Eggert 2011-03-15 16:30:07 -07:00
parent 5274691837
commit a415e6946f
2 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2011-03-15 Paul Eggert <eggert@cs.ucla.edu>
* doc.c (Fdocumentation, Fsnarf_documentation): Move locals to
avoid shadowing.
* lisp.h (eassert): Check that the argument compiles, even if
ENABLE_CHECKING is not defined.

36
src/doc.c
View file

@ -322,17 +322,20 @@ string is passed through `substitute-command-keys'. */)
{
Lisp_Object fun;
Lisp_Object funcar;
Lisp_Object tem, doc;
Lisp_Object doc;
int try_reload = 1;
documentation:
doc = Qnil;
if (SYMBOLP (function)
&& (tem = Fget (function, Qfunction_documentation),
!NILP (tem)))
return Fdocumentation_property (function, Qfunction_documentation, raw);
if (SYMBOLP (function))
{
Lisp_Object tem = Fget (function, Qfunction_documentation);
if (!NILP (tem))
return Fdocumentation_property (function, Qfunction_documentation,
raw);
}
fun = Findirect_function (function, Qnil);
if (SUBRP (fun))
@ -348,13 +351,16 @@ string is passed through `substitute-command-keys'. */)
{
if ((ASIZE (fun) & PSEUDOVECTOR_SIZE_MASK) <= COMPILED_DOC_STRING)
return Qnil;
tem = AREF (fun, COMPILED_DOC_STRING);
if (STRINGP (tem))
doc = tem;
else if (NATNUMP (tem) || CONSP (tem))
doc = tem;
else
return Qnil;
{
Lisp_Object tem = AREF (fun, COMPILED_DOC_STRING);
if (STRINGP (tem))
doc = tem;
else if (NATNUMP (tem) || CONSP (tem))
doc = tem;
else
return Qnil;
}
}
else if (STRINGP (fun) || VECTORP (fun))
{
@ -370,9 +376,8 @@ string is passed through `substitute-command-keys'. */)
else if (EQ (funcar, Qlambda)
|| EQ (funcar, Qautoload))
{
Lisp_Object tem1;
tem1 = Fcdr (Fcdr (fun));
tem = Fcar (tem1);
Lisp_Object tem1 = Fcdr (Fcdr (fun));
Lisp_Object tem = Fcar (tem1);
if (STRINGP (tem))
doc = tem;
/* Handle a doc reference--but these never come last
@ -539,7 +544,7 @@ the same file name is found in the `doc-directory'. */)
char buf[1024 + 1];
register EMACS_INT filled;
register EMACS_INT pos;
register char *p, *end;
register char *p;
Lisp_Object sym;
char *name;
int skip_file = 0;
@ -598,6 +603,7 @@ the same file name is found in the `doc-directory'. */)
pos = 0;
while (1)
{
register char *end;
if (filled < 512)
filled += emacs_read (fd, &buf[filled], sizeof buf - 1 - filled);
if (!filled)