diff options
author | Jan D <[email protected]> | 2010-08-14 08:42:09 +0200 |
---|---|---|
committer | Jan D <[email protected]> | 2010-08-14 08:42:09 +0200 |
commit | 983b8302209c32043178edd8b89941857699d6b4 (patch) | |
tree | eb5ee2976ee7a600a8c03d50c897644a610eb294 | |
parent | ec1339fbce4df95a3ae96b7796a28dfe6186db4e (diff) |
* doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S.
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/doc.c | 29 |
2 files changed, 20 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f36714d379..2f011db378 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-08-14 Jan Djärv <[email protected]> + + * doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S. + 2010-08-13 Jan Djärv <[email protected]> * doc.c (Fsnarf_documentation): Initialize skip_file before @@ -640,25 +640,28 @@ the same file name is found in the `doc-directory'. */) p = buf; end = buf + (filled < 512 ? filled : filled - 128); while (p != end && *p != '\037') p++; - /* p points to ^_Ffunctionname\n or ^_Vvarname\n. */ + /* p points to ^_Ffunctionname\n or ^_Vvarname\n or ^_Sfilename\n. */ if (p != end) { end = (char *) index (p, '\n'); - skip_file = 0; /* See if this is a file name, and if it is a file in build-files. */ - if (p[1] == 'S' && end - p > 4 && end[-2] == '.' - && (end[-1] == 'o' || end[-1] == 'c')) + if (p[1] == 'S') { - int len = end - p - 2; - char *fromfile = alloca (len + 1); - strncpy (fromfile, &p[2], len); - fromfile[len] = 0; - if (fromfile[len-1] == 'c') - fromfile[len-1] = 'o'; - - skip_file = NILP (Fmember (build_string (fromfile), - Vbuild_files)); + skip_file = 0; + if (end - p > 4 && end[-2] == '.' + && (end[-1] == 'o' || end[-1] == 'c')) + { + int len = end - p - 2; + char *fromfile = alloca (len + 1); + strncpy (fromfile, &p[2], len); + fromfile[len] = 0; + if (fromfile[len-1] == 'c') + fromfile[len-1] = 'o'; + + skip_file = NILP (Fmember (build_string (fromfile), + Vbuild_files)); + } } sym = oblookup (Vobarray, p + 2, |