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

1 files changed, 6 insertions, 4 deletions

diff --git a/src/doc.c b/src/doc.c
index 3b335127a75..f491661a616 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -693,15 +693,17 @@ the same file name is found in the `doc-directory'.  */)
               if (fromfile[len-1] == 'c')
                 fromfile[len-1] = 'o';
 
-              if (EQ (Fmember (build_string (fromfile), Vbuild_files), Qnil))
-                skip_file = 1;
-              else
-                skip_file = 0;
+              skip_file = NILP (Fmember (build_string (fromfile),
+                                         Vbuild_files));
             }
 
           sym = oblookup (Vobarray, p + 2,
                           multibyte_chars_in_text (p + 2, end - p - 2),
                           end - p - 2);
+          /* Check skip_file so that when a function is defined several
+             times in different files (typically, once in xterm, once in
+             w32term, ...), we only pay attention to the one that
+             matters.  */
           if (! skip_file && SYMBOLP (sym))
             {
               /* Attach a docstring to a variable?  */