[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99976: * doc.c (Fsnarf_documentat
From: |
Jan D |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99976: * doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S. |
Date: |
Sat, 14 Aug 2010 08:42:09 +0200 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 99976
committer: Jan D <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-08-14 08:42:09 +0200
message:
* doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S.
modified:
src/ChangeLog
src/doc.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-08-13 10:32:37 +0000
+++ b/src/ChangeLog 2010-08-14 06:42:09 +0000
@@ -1,3 +1,7 @@
+2010-08-14 Jan Djärv <address@hidden>
+
+ * doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S.
+
2010-08-13 Jan Djärv <address@hidden>
* doc.c (Fsnarf_documentation): Initialize skip_file before
=== modified file 'src/doc.c'
--- a/src/doc.c 2010-08-13 10:32:37 +0000
+++ b/src/doc.c 2010-08-14 06:42:09 +0000
@@ -640,25 +640,28 @@
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 = 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));
+ skip_file = NILP (Fmember (build_string (fromfile),
+ Vbuild_files));
+ }
}
sym = oblookup (Vobarray, p + 2,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-23 r99976: * doc.c (Fsnarf_documentation): Set skip_file only if p[1] is S.,
Jan D <=