[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 b8286d2 08/25: doc.c: do
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] feature/aptel/dynamic-modules-rc3 b8286d2 08/25: doc.c: don't prefix doc path by ../etc/ for modules |
Date: |
Wed, 04 Feb 2015 22:56:12 +0000 |
branch: feature/aptel/dynamic-modules-rc3
commit b8286d22206981b277629eea7f4a8ec219663997
Author: Aurélien Aptel <address@hidden>
Commit: Aurélien Aptel <address@hidden>
doc.c: don't prefix doc path by ../etc/ for modules
---
src/doc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/doc.c b/src/doc.c
index bc74553..5290b5d 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -118,11 +118,11 @@ get_doc_string (Lisp_Object filepos, bool unibyte, bool
definition)
return Qnil;
/* Put the file name in NAME as a C string.
- If it is relative, combine it with Vdoc_directory. */
+ If it is relative and not from a module, combine it with Vdoc_directory.
*/
tem = Ffile_name_absolute_p (file);
file = ENCODE_FILE (file);
- if (NILP (tem))
+ if (NILP (tem) && !doc_is_from_module_p (SSDATA (file)))
{
Lisp_Object docdir = ENCODE_FILE (Vdoc_directory);
minsize = SCHARS (docdir);
- [Emacs-diffs] branch feature/aptel/dynamic-modules-rc3 created (now 9a1d734), Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 6478a32 03/25: intern literal strings as regular string., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 0526616 04/25: add sample module `fmod'., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 19705b8 06/25: alloc.c: protect doc field from GC., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 fc0f6ec 02/25: add `load-module' function to emacs lisp., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 0cfb066 07/25: doc.c: use DOC format sanity checks instead of bytecompiled checks on module doc files., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 79e2c28 05/25: change Subr doc field from char* to Lisp_Object., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 b8286d2 08/25: doc.c: don't prefix doc path by ../etc/ for modules,
Teodor Zlatanov <=
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1b98be3 09/25: move fmod module in modules/fmod/., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 772cb16 01/25: add libltdl configure option/dependency., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 bfe16af 10/25: new module: opaque, Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 89c8287 11/25: opaque: add comments., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9330ca6 12/25: new module: elisp, Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 9da7346 13/25: new module: curl. basic URL fetcher working., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 582704c 14/25: curl: use url arg., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 8147699 15/25: fix docstring., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 a95e032 17/25: update modules examples with `provide' call., Teodor Zlatanov, 2015/02/04
- [Emacs-diffs] feature/aptel/dynamic-modules-rc3 1959b65 18/25: use `load-module-suffixes' as a source of module suffixes., Teodor Zlatanov, 2015/02/04