[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 6e9c6b1 26/35: doc.c: fi
From: |
Noah Friedman |
Subject: |
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 6e9c6b1 26/35: doc.c: fix module doc prefix |
Date: |
Mon, 8 May 2017 19:46:38 -0400 (EDT) |
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 file 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 4e1ad37 19/35: new yaml parsing module using libyaml, (continued)
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4e1ad37 19/35: new yaml parsing module using libyaml, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 8147699 15/35: fix docstring., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 bfe16af 10/35: new module: opaque, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 582704c 14/35: curl: use url arg., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9330ca6 12/35: new module: elisp, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9da7346 13/35: new module: curl. basic URL fetcher working., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 c7248ea 21/35: yaml module: rename `yaml-parse' to `yaml-parse-buffer'., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 a95e032 17/35: update modules examples with `provide' call., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1959b65 18/35: use `load-module-suffixes' as a source of module suffixes., Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1da9b91 24/35: opaque module: rename Qc variable to Qc_ due to macro collision, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 6e9c6b1 26/35: doc.c: fix module doc prefix,
Noah Friedman <=
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 3a2aab6 29/35: modules/fmod: use M prefix for module global vars, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 ef45794 32/35: modules/yaml: skip TODO tests, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9461927 33/35: modules/opaque/test.el: use `should' macro instead of assert, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 b82611b 27/35: modules/tests.py: honnor module list from args, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 2e998a7 30/35: modules/fmod: use right docstring in test, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 4257b6b 28/35: lread.c: update load-module docstring, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 f52bd1f 31/35: modules: prefix all global module variable with M, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9a1d734 25/35: modules/: add proper testing, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9dc8a56 34/35: modules/yaml/test.el: implement deep equal + remainging tests, Noah Friedman, 2017/05/08
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 41ec64b 23/35: Merge branch 'master' into dynamic-modules, Noah Friedman, 2017/05/08