[Emacs-diffs] dynamic-modules 1be03fd 08/22: doc.c: don't prefix doc path by ../etc/ for modules

[Teodor Zlatanov]

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);