[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] dynamic-modules 1be03fd 08/22: doc.c: don't prefix doc pat
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] dynamic-modules 1be03fd 08/22: doc.c: don't prefix doc path by ../etc/ for modules |
Date: |
Thu, 27 Nov 2014 02:01:51 +0000 |
branch: dynamic-modules
commit 1be03fdd902d726c1c8544146af7e4a9e131fc9f
Author: Aurélien Aptel <address@hidden>
Date: Sun Nov 23 21:00:37 2014 +0100
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 dynamic-modules created (now 9313182), Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 14ea9e0 03/22: intern literal strings as regular string., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 3f762bd 02/22: add `load-module' function to emacs lisp., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 5c710fb 01/22: add libltdl configure option/dependency., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 2010646 04/22: add sample module `fmod'., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 1be03fd 08/22: doc.c: don't prefix doc path by ../etc/ for modules,
Teodor Zlatanov <=
- [Emacs-diffs] dynamic-modules fa450f8 07/22: doc.c: use DOC format sanity checks instead of bytecompiled checks on module doc files., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules d2271bc 06/22: alloc.c: protect doc field from GC., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules cc5fe95 09/22: move fmod module in modules/fmod/., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules c0eb5a6 05/22: change Subr doc field from char* to Lisp_Object., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules e374b97 11/22: opaque: add comments., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 1be7b68 10/22: new module: opaque, Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules db69d49 12/22: new module: elisp, Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 106c15b 14/22: curl: use url arg., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules 334564f 15/22: fix docstring., Teodor Zlatanov, 2014/11/26
- [Emacs-diffs] dynamic-modules ada5c5e 13/22: new module: curl. basic URL fetcher working., Teodor Zlatanov, 2014/11/26