[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 6e9c6b1 1/9: doc.c: fix
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 6e9c6b1 1/9: doc.c: fix module doc prefix |
Date: |
Tue, 10 Feb 2015 14:53:54 +0000 |
branch: feature/aptel/dynamic-modules-rc3
commit 6e9c6b183602474e570aa4b1881b3bbe4ade3afd
Author: Aurélien Aptel <address@hidden>
Commit: Aurélien Aptel <address@hidden>
doc.c: fix module doc prefix
---
src/doc.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/doc.c b/src/doc.c
index b5611c5..5d0a05e 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -597,6 +597,9 @@ the same file name is found in the `doc-directory'. */)
the "global" DOC file */
Vdoc_file_name = filename;
+ /* and in that case, the filename has to be prefixed with the
+ right directory path */
+
if
#ifndef CANNOT_DUMP
(!NILP (Vpurify_flag))
@@ -616,9 +619,10 @@ the same file name is found in the `doc-directory'. */)
}
else
{
- CHECK_STRING (Vdoc_directory);
- dirname = SSDATA (Vdoc_directory);
- dirlen = SBYTES (Vdoc_directory);
+ /* If we're processing a module doc file, don't prefix anything
+ because the filename is already a proper path */
+ dirname = "";
+ dirlen = 0;
}
count = SPECPDL_INDEX ();
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 updated (9a1d734 -> 9dc8a56), Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 6e9c6b1 1/9: doc.c: fix module doc prefix,
Teodor Zlatanov <=
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 b82611b 2/9: modules/tests.py: honnor module list from args, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4257b6b 3/9: lread.c: update load-module docstring, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 3a2aab6 4/9: modules/fmod: use M prefix for module global vars, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 2e998a7 5/9: modules/fmod: use right docstring in test, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 ef45794 7/9: modules/yaml: skip TODO tests, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 f52bd1f 6/9: modules: prefix all global module variable with M, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9dc8a56 9/9: modules/yaml/test.el: implement deep equal + remainging tests, Teodor Zlatanov, 2015/02/10
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9461927 8/9: modules/opaque/test.el: use `should' macro instead of assert, Teodor Zlatanov, 2015/02/10