changeset 85324:228a7fde2f4a

(Fsnarf_documentation): Simplify.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 16 Oct 2007 03:28:43 +0000
parents 0276143e4580
children f885ff424d69
files src/ChangeLog src/doc.c
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Oct 16 02:41:08 2007 +0000
+++ b/src/ChangeLog	Tue Oct 16 03:28:43 2007 +0000
@@ -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.
--- a/src/doc.c	Tue Oct 16 02:41:08 2007 +0000
+++ b/src/doc.c	Tue Oct 16 03:28:43 2007 +0000
@@ -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?  */