(Fsnarf_documentation): Simplify.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4ba46df0f2306ffb24ad588bc7c4d7397cce865d..bed9166f9f0826cc5fc1f6b10e3fb87106b05e1d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * doc.c (Fsnarf_documentation): Simplify.
+
 2007-10-14  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32term.c (w32_font_is_double_byte, my_create_scrollbar): Make static.

diff --git a/src/doc.c b/src/doc.c
index 25f6625d404221a001a80cdd53ca879f7ee49b27..4cd43f0ae90662289293e2f2a26ee97625692b01 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -691,15 +691,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?  */