Mercurial > emacs
comparison src/doc.c @ 91056:1251cabc40b7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 890-898)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 122-128)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 257-258)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 19 Oct 2007 00:00:21 +0000 |
parents | 35069180a991 228a7fde2f4a |
children | 4b09bb044f38 |
comparison
equal
deleted
inserted
replaced
91055:46bc3a01b2fa | 91056:1251cabc40b7 |
---|---|
691 strncpy (fromfile, &p[2], len); | 691 strncpy (fromfile, &p[2], len); |
692 fromfile[len] = 0; | 692 fromfile[len] = 0; |
693 if (fromfile[len-1] == 'c') | 693 if (fromfile[len-1] == 'c') |
694 fromfile[len-1] = 'o'; | 694 fromfile[len-1] = 'o'; |
695 | 695 |
696 if (EQ (Fmember (build_string (fromfile), Vbuild_files), Qnil)) | 696 skip_file = NILP (Fmember (build_string (fromfile), |
697 skip_file = 1; | 697 Vbuild_files)); |
698 else | |
699 skip_file = 0; | |
700 } | 698 } |
701 | 699 |
702 sym = oblookup (Vobarray, p + 2, | 700 sym = oblookup (Vobarray, p + 2, |
703 multibyte_chars_in_text (p + 2, end - p - 2), | 701 multibyte_chars_in_text (p + 2, end - p - 2), |
704 end - p - 2); | 702 end - p - 2); |
703 /* Check skip_file so that when a function is defined several | |
704 times in different files (typically, once in xterm, once in | |
705 w32term, ...), we only pay attention to the one that | |
706 matters. */ | |
705 if (! skip_file && SYMBOLP (sym)) | 707 if (! skip_file && SYMBOLP (sym)) |
706 { | 708 { |
707 /* Attach a docstring to a variable? */ | 709 /* Attach a docstring to a variable? */ |
708 if (p[1] == 'V') | 710 if (p[1] == 'V') |
709 { | 711 { |