emacs-diffs
[Top][All Lists]
Advanced

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]