[Emacs-diffs] Changes to emacs/src/doc.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/10/16 03:28:44

Index: doc.c
===================================================================
RCS file: /sources/emacs/emacs/src/doc.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- doc.c       26 Jul 2007 05:27:50 -0000      1.124
+++ doc.c       16 Oct 2007 03:28:43 -0000      1.125
@@ -691,15 +691,17 @@
               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?  */